Mercurial > hg
comparison tests/test-shelve.t @ 38619:9b077e5fa8ba
shelve: use more accurate description in conflict marker
We use "shelve" and "working-copy" instead of "source" and "dest". This is a net
win.
Differential Revision: https://phab.mercurial-scm.org/D3694
author | Boris Feld <boris.feld@octobus.net> |
---|---|
date | Tue, 05 Jun 2018 12:04:15 +0200 |
parents | c829749e7639 |
children | abcf500d527c |
comparison
equal
deleted
inserted
replaced
38618:c829749e7639 | 38619:9b077e5fa8ba |
---|---|
374 diff --git a/a/a b/a/a | 374 diff --git a/a/a b/a/a |
375 --- a/a/a | 375 --- a/a/a |
376 +++ b/a/a | 376 +++ b/a/a |
377 @@ -1,2 +1,6 @@ | 377 @@ -1,2 +1,6 @@ |
378 a | 378 a |
379 +<<<<<<< dest: * - shelve: pending changes temporary commit (glob) | 379 +<<<<<<< shelve: 562f7831e574 - shelve: pending changes temporary commit |
380 c | 380 c |
381 +======= | 381 +======= |
382 +a | 382 +a |
383 +>>>>>>> source: 32c69314e062 - shelve: changes to: [mq]: second.patch | 383 +>>>>>>> working-copy: 32c69314e062 - shelve: changes to: [mq]: second.patch |
384 diff --git a/b/b b/b.rename/b | 384 diff --git a/b/b b/b.rename/b |
385 rename from b/b | 385 rename from b/b |
386 rename to b.rename/b | 386 rename to b.rename/b |
387 diff --git a/c b/c.copy | 387 diff --git a/c b/c.copy |
388 copy from c | 388 copy from c |
796 | 796 |
797 $ hg st | 797 $ hg st |
798 M f | 798 M f |
799 ? f.orig | 799 ? f.orig |
800 $ cat f | 800 $ cat f |
801 <<<<<<< dest: 5f6b880e719b - shelve: pending changes temporary commit | 801 <<<<<<< shelve: 5f6b880e719b - shelve: pending changes temporary commit |
802 g | 802 g |
803 ======= | 803 ======= |
804 f | 804 f |
805 >>>>>>> source: 81152db69da7 - shelve: changes to: commit stuff | 805 >>>>>>> working-copy: 81152db69da7 - shelve: changes to: commit stuff |
806 $ cat f.orig | 806 $ cat f.orig |
807 g | 807 g |
808 $ hg unshelve --abort -t false | 808 $ hg unshelve --abort -t false |
809 tool option will be ignored | 809 tool option will be ignored |
810 unshelve of 'default' aborted | 810 unshelve of 'default' aborted |
838 [1] | 838 [1] |
839 $ hg st | 839 $ hg st |
840 M f | 840 M f |
841 ? f.orig | 841 ? f.orig |
842 $ cat f | 842 $ cat f |
843 <<<<<<< dest: * - test: intermediate other change (glob) | 843 <<<<<<< shelve: 6b563750f973 - test: intermediate other change |
844 g | 844 g |
845 ======= | 845 ======= |
846 f | 846 f |
847 >>>>>>> source: 81152db69da7 - shelve: changes to: commit stuff | 847 >>>>>>> working-copy: 81152db69da7 - shelve: changes to: commit stuff |
848 $ cat f.orig | 848 $ cat f.orig |
849 g | 849 g |
850 $ hg unshelve --abort | 850 $ hg unshelve --abort |
851 unshelve of 'default' aborted | 851 unshelve of 'default' aborted |
852 $ hg st | 852 $ hg st |