Mercurial > evolve

comparison tests/test-amend-merge.t @ 6032:2800aa3c3dbf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
topic: drop the old workaround for detecting amends by amend_source We don't need to have this workaround because amends are handled differently now. See previous commits, where the old code for handling amends in topic extension gets removed. Various commits now preserve amend_source when going through the _changetopics function (used when changing a topic via the hg topics command).
author Anton Shestakov <av6@dwimlabs.net>
date Mon, 30 Aug 2021 12:05:14 +0300
parents c3d66af4cb07
children
comparison
equal deleted inserted replaced
6031:c3d66af4cb07 6032:2800aa3c3dbf
81 81
82 $ hg topics -r . foo 82 $ hg topics -r . foo
83 switching to topic foo 83 switching to topic foo
84 changed topic on 1 changesets to "foo" 84 changed topic on 1 changesets to "foo"
85 $ hg log -r . -T '{rev}: {join(extras, " ")}\n' 85 $ hg log -r . -T '{rev}: {join(extras, " ")}\n'
86 6: _rewrite_noise=[0-9a-f]+ branch=default topic=foo (re) 86 6: _rewrite_noise=[0-9a-f]+ amend_source=[0-9a-f]+ branch=default topic=foo (re)
87 $ hg diff -r 'p1(.)' -r '.' 87 $ hg diff -r 'p1(.)' -r '.'
88 diff -r 88a060ab6523 -r 52150b9639f7 banana 88 diff -r 88a060ab6523 -r 05be679ae1bd banana
89 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 89 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
90 +++ b/banana Thu Jan 01 00:00:00 1970 +0000 90 +++ b/banana Thu Jan 01 00:00:00 1970 +0000
91 @@ -0,0 +1,1 @@ 91 @@ -0,0 +1,1 @@
92 +banana 92 +banana
93 $ hg diff -r 'p2(.)' -r '.' 93 $ hg diff -r 'p2(.)' -r '.'
94 diff -r d8c7baf0ca58 -r 52150b9639f7 apple 94 diff -r d8c7baf0ca58 -r 05be679ae1bd apple
95 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 95 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
96 +++ b/apple Thu Jan 01 00:00:00 1970 +0000 96 +++ b/apple Thu Jan 01 00:00:00 1970 +0000
97 @@ -0,0 +1,1 @@ 97 @@ -0,0 +1,1 @@
98 +apple 98 +apple
99 99