equal
deleted
inserted
replaced
53 > pick 42ccdea3bb16 B |
53 > pick 42ccdea3bb16 B |
54 > pick 5fddd98957c8 C |
54 > pick 5fddd98957c8 C |
55 > pick 32af7686d403 D |
55 > pick 32af7686d403 D |
56 > EOF |
56 > EOF |
57 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
57 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
58 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
59 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
60 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
61 |
58 |
62 $ hg tglog |
59 $ hg tglog |
63 @ 7:0937e82309df47d14176ee15e45dbec5fbdef340:draft 'D' |
60 @ 7:0937e82309df47d14176ee15e45dbec5fbdef340:draft 'D' |
64 | |
61 | |
65 o 6:f778d1cbddac4ab679d9983c9bb92e4c5e09e7fa:draft 'C' |
62 o 6:f778d1cbddac4ab679d9983c9bb92e4c5e09e7fa:draft 'C' |
82 > pick 3d41b7cc7085 B |
79 > pick 3d41b7cc7085 B |
83 > drop f778d1cbddac C |
80 > drop f778d1cbddac C |
84 > pick 0937e82309df D |
81 > pick 0937e82309df D |
85 > EOF |
82 > EOF |
86 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
83 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
87 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
88 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
89 |
84 |
90 $ hg tglog |
85 $ hg tglog |
91 @ 6:476cc3e4168da2d036b141f7f7dcff7f8e3fe846:draft 'D' |
86 @ 6:476cc3e4168da2d036b141f7f7dcff7f8e3fe846:draft 'D' |
92 | |
87 | |
93 o 5:d273e35dcdf21a7eb305192ef2e362887cd0a6f8:draft 'B' |
88 o 5:d273e35dcdf21a7eb305192ef2e362887cd0a6f8:draft 'B' |
108 > pick d273e35dcdf2 B |
103 > pick d273e35dcdf2 B |
109 > base cd010b8cd998 |
104 > base cd010b8cd998 |
110 > pick 476cc3e4168d D |
105 > pick 476cc3e4168d D |
111 > EOF |
106 > EOF |
112 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
107 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
113 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
114 |
108 |
115 $ hg tglog |
109 $ hg tglog |
116 @ 6:d7a6f907a822c4ce6f15662ae45a42aa46d3818a:draft 'D' |
110 @ 6:d7a6f907a822c4ce6f15662ae45a42aa46d3818a:draft 'D' |
117 | |
111 | |
118 | o 5:d273e35dcdf21a7eb305192ef2e362887cd0a6f8:draft 'B' |
112 | o 5:d273e35dcdf21a7eb305192ef2e362887cd0a6f8:draft 'B' |
151 $ hg histedit 6 --commands - 2>&1 << EOF | fixbundle |
145 $ hg histedit 6 --commands - 2>&1 << EOF | fixbundle |
152 > base d273e35dcdf2 B |
146 > base d273e35dcdf2 B |
153 > drop d7a6f907a822 D |
147 > drop d7a6f907a822 D |
154 > pick 591369deedfd X |
148 > pick 591369deedfd X |
155 > EOF |
149 > EOF |
156 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
157 merging B |
150 merging B |
158 warning: conflicts while merging B! (edit, then use 'hg resolve --mark') |
151 warning: conflicts while merging B! (edit, then use 'hg resolve --mark') |
159 Fix up the change and run hg histedit --continue |
152 Fix up the change and run hg histedit --continue |
160 $ hg histedit --abort | fixbundle |
153 $ hg histedit --abort | fixbundle |
161 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
154 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
180 $ hg histedit 6 --commands - 2>&1 << EOF | fixbundle |
173 $ hg histedit 6 --commands - 2>&1 << EOF | fixbundle |
181 > base d273e35dcdf2 B |
174 > base d273e35dcdf2 B |
182 > drop d7a6f907a822 D |
175 > drop d7a6f907a822 D |
183 > pick 591369deedfd X |
176 > pick 591369deedfd X |
184 > EOF |
177 > EOF |
185 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
186 merging B |
178 merging B |
187 warning: conflicts while merging B! (edit, then use 'hg resolve --mark') |
179 warning: conflicts while merging B! (edit, then use 'hg resolve --mark') |
188 Fix up the change and run hg histedit --continue |
180 Fix up the change and run hg histedit --continue |
189 $ echo b2 > B |
181 $ echo b2 > B |
190 $ hg resolve --mark B |
182 $ hg resolve --mark B |