Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: set custom conflict label for base commit
authorMartin von Zweigbergk <martinvonz@google.com>
Tue, 18 Jan 2022 14:57:15 -0800
changeset 48588 402a6b6173e9
parent 48587 3c8cc987672e
child 48589 a51c522c0064
rebase: set custom conflict label for base commit Differential Revision: https://phab.mercurial-scm.org/D12020
hgext/rebase.py file | annotate | diff | comparison | revisions
tests/test-rebase-collapse.t file | annotate | diff | comparison | revisions
tests/test-rebase-conflicts.t file | annotate | diff | comparison | revisions
tests/test-sparse.t file | annotate | diff | comparison | revisions 
--- a/hgext/rebase.py	Thu Jan 20 11:06:52 2022 -0800
+++ b/hgext/rebase.py	Tue Jan 18 14:57:15 2022 -0800
@@ -1544,7 +1544,7 @@
         force=True,
         ancestor=base,
         mergeancestor=mergeancestor,
-        labels=[b'dest', b'source'],
+        labels=[b'dest', b'source', b'parent of source'],
         wc=wctx,
     )
     wctx.setparents(p1ctx.node(), repo[p2].node())
--- a/tests/test-rebase-collapse.t	Thu Jan 20 11:06:52 2022 -0800
+++ b/tests/test-rebase-collapse.t	Tue Jan 18 14:57:15 2022 -0800
@@ -717,13 +717,13 @@
   o  0: 4a2df7238c3b 'A'
   
   $ cat A
-  <<<<<<< dest:   82b8abf9c185 D - test: D
+  <<<<<<< dest:             82b8abf9c185 D - test: D
   D
-  ||||||| base:   4a2df7238c3b A - test: A
+  ||||||| parent of source: 4a2df7238c3b A - test: A
   A
   =======
   B
-  >>>>>>> source: f899f3910ce7 B - test: B
+  >>>>>>> source:           f899f3910ce7 B - test: B
   $ echo BC > A
   $ hg resolve -m
   (no more unresolved files)
@@ -745,13 +745,13 @@
   o  0: 4a2df7238c3b 'A'
   
   $ cat A
-  <<<<<<< dest:   82b8abf9c185 D - test: D
+  <<<<<<< dest:             82b8abf9c185 D - test: D
   BC
-  ||||||| base:   f899f3910ce7 B - test: B
+  ||||||| parent of source: f899f3910ce7 B - test: B
   B
   =======
   C
-  >>>>>>> source: 63668d570d21 C tip - test: C
+  >>>>>>> source:           63668d570d21 C tip - test: C
   $ echo BD > A
   $ hg resolve -m
   (no more unresolved files)
--- a/tests/test-rebase-conflicts.t	Thu Jan 20 11:06:52 2022 -0800
+++ b/tests/test-rebase-conflicts.t	Tue Jan 18 14:57:15 2022 -0800
@@ -372,13 +372,13 @@
   +++ b/a	* (glob)
   @@ -1,2 +1,8 @@
    a
-  +<<<<<<< dest:   328e4ab1f7cc ab - test: ab
+  +<<<<<<< dest:             328e4ab1f7cc ab - test: ab
    b
-  +||||||| base:   cb9a9f314b8b - test: a
+  +||||||| parent of source: cb9a9f314b8b - test: a
   +=======
   +b
   +c
-  +>>>>>>> source: 7bc217434fc1 - test: abc
+  +>>>>>>> source:           7bc217434fc1 - test: abc
 
 Test rebase with obsstore turned on and off (issue5606)
 
--- a/tests/test-sparse.t	Thu Jan 20 11:06:52 2022 -0800
+++ b/tests/test-sparse.t	Tue Jan 18 14:57:15 2022 -0800
@@ -211,11 +211,11 @@
   hide
 
   $ cat hide
-  <<<<<<< dest:   39278f7c08a9 - test: two
+  <<<<<<< dest:             39278f7c08a9 - test: two
   y
   =======
   z
-  >>>>>>> source: b91df4f39e75 - test: edit hide
+  >>>>>>> source:           b91df4f39e75 - test: edit hide
 
 Verify aborting a rebase cleans up temporary files
mercurial