Show More
@@ -1000,7 +1000,11 b' def _rebaserestoredcommit(' | |||
|
1000 | 1000 | stats = merge.graft( |
|
1001 | 1001 | repo, |
|
1002 | 1002 | shelvectx, |
|
1003 | labels=[b'working-copy', b'shelve'], | |
|
1003 | labels=[ | |
|
1004 | b'working-copy', | |
|
1005 | b'shelved change', | |
|
1006 | b'parent of shelved change', | |
|
1007 | ], | |
|
1004 | 1008 | keepconflictparent=True, |
|
1005 | 1009 | ) |
|
1006 | 1010 | if stats.unresolvedcount: |
@@ -423,7 +423,7 b' ensure that we have a merge with unresol' | |||
|
423 | 423 | c |
|
424 | 424 | +======= |
|
425 | 425 | +a |
|
426 |
+>>>>>>> shelve |
|
|
426 | +>>>>>>> shelved change: 203c9f771d2b - shelve: changes to: [mq]: second.patch | |
|
427 | 427 | diff --git a/b/b b/b.rename/b |
|
428 | 428 | rename from b/b |
|
429 | 429 | rename to b.rename/b |
@@ -257,7 +257,7 b' unshelve and conflicts with tracked and ' | |||
|
257 | 257 | g |
|
258 | 258 | ======= |
|
259 | 259 | f |
|
260 |
>>>>>>> shelve: |
|
|
260 | >>>>>>> shelved change: aef214a5229c - shelve: changes to: commit stuff | |
|
261 | 261 | $ cat f.orig |
|
262 | 262 | g |
|
263 | 263 | $ hg unshelve --abort -t false |
@@ -299,7 +299,7 b' unshelve and conflicts with tracked and ' | |||
|
299 | 299 | g |
|
300 | 300 | ======= |
|
301 | 301 | f |
|
302 |
>>>>>>> shelve: |
|
|
302 | >>>>>>> shelved change: aef214a5229c - shelve: changes to: commit stuff | |
|
303 | 303 | $ cat f.orig |
|
304 | 304 | g |
|
305 | 305 | |
@@ -990,5 +990,5 b' Demonstrate that the labels are correct ' | |||
|
990 | 990 | this is in wdir, conflicts with shelve |
|
991 | 991 | ======= |
|
992 | 992 | this will be shelved |
|
993 |
>>>>>>> shelve: |
|
|
993 | >>>>>>> shelved change: 9c072a2163db - shelve: changes to: r0 | |
|
994 | 994 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now