D12022: update: set custom conflict label for base commit

[martinvonz (Martin von Zweigbergk)]

martinvonz created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D12022

AFFECTED FILES
  mercurial/merge.py
  tests/test-conflict.t
  tests/test-update-branches.t

CHANGE DETAILS

diff --git a/tests/test-update-branches.t b/tests/test-update-branches.t
--- a/tests/test-update-branches.t
+++ b/tests/test-update-branches.t
@@ -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
diff --git a/tests/test-conflict.t b/tests/test-conflict.t
--- a/tests/test-conflict.t
+++ b/tests/test-conflict.t
@@ -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
diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -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,
     )



To: martinvonz, #hg-reviewers
Cc: mercurial-patches, mercurial-devel