Show More
@@ -97,13 +97,7 fix up | |||||
97 | $ hg resolve --mark e |
|
97 | $ hg resolve --mark e | |
98 | (no more unresolved files) |
|
98 | (no more unresolved files) | |
99 | continue: hg histedit --continue |
|
99 | continue: hg histedit --continue | |
100 | $ cat > cat.py <<EOF |
|
100 | $ HGEDITOR=cat hg histedit --continue 2>&1 | fixbundle | grep -v '2 files removed' | |
101 | > import sys |
|
|||
102 | > print open(sys.argv[1]).read() |
|
|||
103 |
|
||||
104 |
|
||||
105 | > EOF |
|
|||
106 | $ HGEDITOR="python cat.py" hg histedit --continue 2>&1 | fixbundle | grep -v '2 files removed' |
|
|||
107 | d |
|
101 | d | |
108 | *** |
|
102 | *** | |
109 | does not commute with e |
|
103 | does not commute with e | |
@@ -117,9 +111,6 fix up | |||||
117 | HG: branch 'default' |
|
111 | HG: branch 'default' | |
118 | HG: changed d |
|
112 | HG: changed d | |
119 | HG: changed e |
|
113 | HG: changed e | |
120 |
|
||||
121 |
|
||||
122 |
|
||||
123 | merging e |
|
114 | merging e | |
124 | warning: conflicts while merging e! (edit, then use 'hg resolve --mark') |
|
115 | warning: conflicts while merging e! (edit, then use 'hg resolve --mark') | |
125 | Fix up the change (pick 7b4e2f4b7bcd) |
|
116 | Fix up the change (pick 7b4e2f4b7bcd) |
General Comments 0
You need to be logged in to leave comments.
Login now