Mercurial > hg
comparison tests/test-shelve.t @ 21519:25d5a9ecbb85
merge: add conflict marker formatter (BC)
Adds a conflict marker formatter that can produce custom conflict marker
descriptions. It can be set via ui.mergemarkertemplate. The old behavior
can be used still by setting ui.mergemarkers=basic.
The default format is similar to:
{node|short} {tag} {branch} {bookmarks} - {author}: "{desc|firstline}"
And renders as:
contextblahblah
<<<<<<< local: c7fdd7ce4652 - durham: "Fix broken stuff in my feature branch"
line from my changes
=======
line from the other changes
>>>>>>> other: a3e55d7f4d38 master - sid0: "This is a commit to master th...
morecontextblahblah
author | Durham Goode <durham@fb.com> |
---|---|
date | Thu, 08 May 2014 16:50:22 -0700 |
parents | e4f451c8c05c |
children | 3b40e32e88c3 |
comparison
equal
deleted
inserted
replaced
21518:8e8049b9bda4 | 21519:25d5a9ecbb85 |
---|---|
208 diff --git a/a/a b/a/a | 208 diff --git a/a/a b/a/a |
209 --- a/a/a | 209 --- a/a/a |
210 +++ b/a/a | 210 +++ b/a/a |
211 @@ -1,2 +1,6 @@ | 211 @@ -1,2 +1,6 @@ |
212 a | 212 a |
213 +<<<<<<< local | 213 +<<<<<<< local: * - shelve: "pending changes temporary commit" (glob) |
214 c | 214 c |
215 +======= | 215 +======= |
216 +a | 216 +a |
217 +>>>>>>> other | 217 +>>>>>>> other: * - shelve: "changes to '[mq]: second.patch'" (glob) |
218 diff --git a/b.rename/b b/b.rename/b | 218 diff --git a/b.rename/b b/b.rename/b |
219 new file mode 100644 | 219 new file mode 100644 |
220 --- /dev/null | 220 --- /dev/null |
221 +++ b/b.rename/b | 221 +++ b/b.rename/b |
222 @@ -0,0 +1,1 @@ | 222 @@ -0,0 +1,1 @@ |
602 | 602 |
603 $ hg st | 603 $ hg st |
604 M f | 604 M f |
605 ? f.orig | 605 ? f.orig |
606 $ cat f | 606 $ cat f |
607 <<<<<<< local | 607 <<<<<<< local: 5f6b880e719b - shelve: "pending changes temporary commit" |
608 g | 608 g |
609 ======= | 609 ======= |
610 f | 610 f |
611 >>>>>>> other | 611 >>>>>>> other: 23b29cada8ba - shelve: "changes to 'commit stuff'" |
612 $ cat f.orig | 612 $ cat f.orig |
613 g | 613 g |
614 $ hg unshelve --abort | 614 $ hg unshelve --abort |
615 rebase aborted | 615 rebase aborted |
616 unshelve of 'default' aborted | 616 unshelve of 'default' aborted |
645 [1] | 645 [1] |
646 $ hg st | 646 $ hg st |
647 M f | 647 M f |
648 ? f.orig | 648 ? f.orig |
649 $ cat f | 649 $ cat f |
650 <<<<<<< local | 650 <<<<<<< local: 6b563750f973 - test: "intermediate other change" |
651 g | 651 g |
652 ======= | 652 ======= |
653 f | 653 f |
654 >>>>>>> other | 654 >>>>>>> other: 23b29cada8ba - shelve: "changes to 'commit stuff'" |
655 $ cat f.orig | 655 $ cat f.orig |
656 g | 656 g |
657 $ hg unshelve --abort | 657 $ hg unshelve --abort |
658 rebase aborted | 658 rebase aborted |
659 no changes needed to a | 659 no changes needed to a |