equal
deleted
inserted
replaced
67 $ hg evolve --content-divergent |
67 $ hg evolve --content-divergent |
68 merge:[5] added b |
68 merge:[5] added b |
69 with: [6] added b |
69 with: [6] added b |
70 base: [2] added b |
70 base: [2] added b |
71 rebasing "other" content-divergent changeset da4b96f4a8d6 on c7586e2a9264 |
71 rebasing "other" content-divergent changeset da4b96f4a8d6 on c7586e2a9264 |
72 updating to "local" side of the conflict: 7ed0642d644b |
|
73 merging "other" content-divergent changeset '11f849d7159f' |
|
74 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
72 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
75 working directory is now at 171614c9a791 |
73 working directory is now at 171614c9a791 |
76 |
74 |
77 $ hg glog |
75 $ hg glog |
78 @ 8:171614c9a791 added b |
76 @ 8:171614c9a791 added b |
107 |
105 |
108 $ hg evolve --all |
106 $ hg evolve --all |
109 move:[3] added c |
107 move:[3] added c |
110 atop:[8] added b |
108 atop:[8] added b |
111 move:[4] added d |
109 move:[4] added d |
112 working directory is now at 4ae4427ee9f8 |
110 $ hg glog |
113 $ hg glog |
111 o 10:4ae4427ee9f8 added d |
114 @ 10:4ae4427ee9f8 added d |
|
115 | () [default] draft |
112 | () [default] draft |
116 o 9:917281f93fcb added c |
113 o 9:917281f93fcb added c |
117 | () [default] draft |
114 | () [default] draft |
118 o 8:171614c9a791 added b |
115 @ 8:171614c9a791 added b |
119 | () [default] draft |
116 | () [default] draft |
120 o 1:c7586e2a9264 added a |
117 o 1:c7586e2a9264 added a |
121 | () [default] draft |
118 | () [default] draft |
122 o 0:8fa14d15e168 added hgignore |
119 o 0:8fa14d15e168 added hgignore |
123 () [default] draft |
120 () [default] draft |
124 |
121 |
125 More testing! |
122 More testing! |
126 |
123 |
127 $ hg up .^^ |
|
128 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
129 $ echo x > x |
124 $ echo x > x |
130 $ hg ci -Aqm "added x" |
125 $ hg ci -Aqm "added x" |
131 $ hg glog -r . |
126 $ hg glog -r . |
132 @ 11:71a392c714b5 added x |
127 @ 11:71a392c714b5 added x |
133 | () [default] draft |
128 | () [default] draft |
168 $ hg evolve --content-divergent |
163 $ hg evolve --content-divergent |
169 merge:[13] added x |
164 merge:[13] added x |
170 with: [12] added foo to x |
165 with: [12] added foo to x |
171 base: [11] added x |
166 base: [11] added x |
172 rebasing "other" content-divergent changeset 1e1a50385a7d on 4ae4427ee9f8 |
167 rebasing "other" content-divergent changeset 1e1a50385a7d on 4ae4427ee9f8 |
173 updating to "local" side of the conflict: 1e4f6b3bb39b |
|
174 merging "other" content-divergent changeset '80cc9b1ec650' |
|
175 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
168 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
176 working directory is now at b006cf317e0e |
169 working directory is now at b006cf317e0e |
177 |
170 |
178 $ hg exp |
171 $ hg exp |
179 # HG changeset patch |
172 # HG changeset patch |
257 $ hg evolve --content-divergent |
250 $ hg evolve --content-divergent |
258 merge:[19] added y |
251 merge:[19] added y |
259 with: [17] added y |
252 with: [17] added y |
260 base: [16] added y |
253 base: [16] added y |
261 rebasing "other" content-divergent changeset 2a9f6ccbdeba on b006cf317e0e |
254 rebasing "other" content-divergent changeset 2a9f6ccbdeba on b006cf317e0e |
262 updating to "local" side of the conflict: b4575ed6fcfc |
|
263 merging "other" content-divergent changeset '48f745db3f53' |
|
264 merging y |
255 merging y |
265 warning: conflicts while merging y! (edit, then use 'hg resolve --mark') |
256 warning: conflicts while merging y! (edit, then use 'hg resolve --mark') |
266 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
257 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
267 fix conflicts and see `hg help evolve.interrupted` |
258 fix conflicts and see `hg help evolve.interrupted` |
268 [1] |
259 [1] |
422 (no more unresolved files) |
413 (no more unresolved files) |
423 continue: hg evolve --continue |
414 continue: hg evolve --continue |
424 |
415 |
425 $ hg evolve --continue |
416 $ hg evolve --continue |
426 evolving 23:3f7a1f693080 "added z" |
417 evolving 23:3f7a1f693080 "added z" |
427 updating to "local" side of the conflict: 53242575ffa9 |
|
428 merging "other" content-divergent changeset 'cdb0643c69fc' |
|
429 merging y |
418 merging y |
430 warning: conflicts while merging y! (edit, then use 'hg resolve --mark') |
419 warning: conflicts while merging y! (edit, then use 'hg resolve --mark') |
431 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
420 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
432 fix conflicts and see `hg help evolve.interrupted` |
421 fix conflicts and see `hg help evolve.interrupted` |
433 [1] |
422 [1] |