Show More
@@ -997,7 +997,7 b' def _rebaserestoredcommit(' | |||
|
997 | 997 | repo, |
|
998 | 998 | shelvectx, |
|
999 | 999 | shelvectx.p1(), |
|
1000 |
labels=[b' |
|
|
1000 | labels=[b'working-copy', b'shelve'], | |
|
1001 | 1001 | keepconflictparent=True, |
|
1002 | 1002 | ) |
|
1003 | 1003 | if stats.unresolvedcount: |
@@ -408,11 +408,11 b' ensure that we have a merge with unresol' | |||
|
408 | 408 | +++ b/a/a |
|
409 | 409 | @@ -1,2 +1,6 @@ |
|
410 | 410 | a |
|
411 |
+<<<<<<< |
|
|
411 | +<<<<<<< working-copy: 2377350b6337 - shelve: pending changes temporary commit | |
|
412 | 412 | c |
|
413 | 413 | +======= |
|
414 | 414 | +a |
|
415 |
+>>>>>>> |
|
|
415 | +>>>>>>> shelve: a68ec3400638 - shelve: changes to: [mq]: second.patch | |
|
416 | 416 | diff --git a/b/b b/b.rename/b |
|
417 | 417 | rename from b/b |
|
418 | 418 | rename to b.rename/b |
@@ -253,11 +253,11 b' unshelve and conflicts with tracked and ' | |||
|
253 | 253 | M f |
|
254 | 254 | ? f.orig |
|
255 | 255 | $ cat f |
|
256 |
<<<<<<< |
|
|
256 | <<<<<<< working-copy: d44eae5c3d33 - shelve: pending changes temporary commit | |
|
257 | 257 | g |
|
258 | 258 | ======= |
|
259 | 259 | f |
|
260 |
>>>>>>> |
|
|
260 | >>>>>>> shelve: aef214a5229c - shelve: changes to: commit stuff | |
|
261 | 261 | $ cat f.orig |
|
262 | 262 | g |
|
263 | 263 | $ hg unshelve --abort -t false |
@@ -295,11 +295,11 b' unshelve and conflicts with tracked and ' | |||
|
295 | 295 | M f |
|
296 | 296 | ? f.orig |
|
297 | 297 | $ cat f |
|
298 |
<<<<<<< |
|
|
298 | <<<<<<< working-copy: 6b563750f973 - test: intermediate other change | |
|
299 | 299 | g |
|
300 | 300 | ======= |
|
301 | 301 | f |
|
302 |
>>>>>>> |
|
|
302 | >>>>>>> shelve: aef214a5229c - shelve: changes to: commit stuff | |
|
303 | 303 | $ cat f.orig |
|
304 | 304 | g |
|
305 | 305 | |
@@ -937,9 +937,9 b' Demonstrate that the labels are correct ' | |||
|
937 | 937 | [1] |
|
938 | 938 | $ cat foo |
|
939 | 939 | r0 |
|
940 |
<<<<<<< |
|
|
940 | <<<<<<< working-copy: 0b2fcf2a90e9 - shelve: pending changes temporary commit | |
|
941 | 941 | this is in wdir, conflicts with shelve |
|
942 | 942 | ======= |
|
943 | 943 | this will be shelved |
|
944 |
>>>>>>> |
|
|
944 | >>>>>>> shelve: 9c072a2163db - shelve: changes to: r0 | |
|
945 | 945 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now