Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update: set custom conflict label for base commit
authorMartin von Zweigbergk <martinvonz@google.com>
Tue, 18 Jan 2022 13:23:49 -0800
changeset 48590 7e503eff3c76
parent 48589 a51c522c0064
child 48591 f1162b125991
update: set custom conflict label for base commit Differential Revision: https://phab.mercurial-scm.org/D12022
mercurial/merge.py file | annotate | diff | comparison | revisions
tests/test-conflict.t file | annotate | diff | comparison | revisions
tests/test-update-branches.t file | annotate | diff | comparison | revisions 
--- a/mercurial/merge.py	Tue Jan 18 15:04:55 2022 -0800
+++ b/mercurial/merge.py	Tue Jan 18 13:23:49 2022 -0800
@@ -2280,7 +2280,7 @@
         ctx.rev(),
         branchmerge=False,
         force=False,
-        labels=[b'working copy', b'destination'],
+        labels=[b'working copy', b'destination', b'working copy parent'],
         updatecheck=updatecheck,
         wc=wc,
     )
--- a/tests/test-conflict.t	Tue Jan 18 15:04:55 2022 -0800
+++ b/tests/test-conflict.t	Tue Jan 18 13:23:49 2022 -0800
@@ -308,7 +308,7 @@
   2
   3
   <<<<<<<
-  ------- base
+  ------- working copy parent
   +++++++ working copy
    4
   +4.5
@@ -346,7 +346,7 @@
   3.5
   4.5
   5.5
-  ------- base
+  ------- working copy parent
   +++++++ destination
    3
   -4
--- a/tests/test-update-branches.t	Tue Jan 18 15:04:55 2022 -0800
+++ b/tests/test-update-branches.t	Tue Jan 18 13:23:49 2022 -0800
@@ -292,14 +292,14 @@
   # To mark files as resolved:  hg resolve --mark FILE
   
   $ cat a
-  <<<<<<< working copy: 6efa171f091b - test: 3
+  <<<<<<< working copy:        6efa171f091b - test: 3
   three
   dirty
-  ||||||| base:         6efa171f091b - test: 3
+  ||||||| working copy parent: 6efa171f091b - test: 3
   three
   =======
   four
-  >>>>>>> destination:  d047485b3896 b1 - test: 4
+  >>>>>>> destination:         d047485b3896 b1 - test: 4
   $ rm a.orig
 
   $ echo 'update.check = noconflict' >> .hg/hgrc
Mercurial