Mercurial > evolve

comparison tests/test-amend-merge.t @ 6031:c3d66af4cb07

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: show extras that are going to change in the next patch
author Anton Shestakov <av6@dwimlabs.net>
date Mon, 30 Aug 2021 12:55:00 +0300
parents 1a8e86053adb
children 2800aa3c3dbf
comparison
equal deleted inserted replaced
6030:30cde40dcd17 6031:c3d66af4cb07
23 $ hg merge 'desc("banana")' 23 $ hg merge 'desc("banana")'
24 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 24 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
25 (branch merge, don't forget to commit) 25 (branch merge, don't forget to commit)
26 26
27 $ hg ci -m merge 27 $ hg ci -m merge
28 $ hg log -r . -T '{rev}: {join(extras, " ")}\n'
29 3: branch=default
28 $ hg diff -r 'p1(.)' -r '.' 30 $ hg diff -r 'p1(.)' -r '.'
29 diff -r 88a060ab6523 -r c20705a6a8c4 banana 31 diff -r 88a060ab6523 -r c20705a6a8c4 banana
30 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 32 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
31 +++ b/banana Thu Jan 01 00:00:00 1970 +0000 33 +++ b/banana Thu Jan 01 00:00:00 1970 +0000
32 @@ -0,0 +1,1 @@ 34 @@ -0,0 +1,1 @@
39 +apple 41 +apple
40 42
41 amend 43 amend
42 44
43 $ hg amend -m 'merge, amend' 45 $ hg amend -m 'merge, amend'
46 $ hg log -r . -T '{rev}: {join(extras, " ")}\n'
47 4: amend_source=[0-9a-f]+ branch=default (re)
44 $ hg diff -r 'p1(.)' -r '.' 48 $ hg diff -r 'p1(.)' -r '.'
45 diff -r 88a060ab6523 -r 456753fae3cd banana 49 diff -r 88a060ab6523 -r 456753fae3cd banana
46 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 50 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
47 +++ b/banana Thu Jan 01 00:00:00 1970 +0000 51 +++ b/banana Thu Jan 01 00:00:00 1970 +0000
48 @@ -0,0 +1,1 @@ 52 @@ -0,0 +1,1 @@
56 60
57 metaedit 61 metaedit
58 62
59 $ hg metaedit -m 'merge, metaedit' 63 $ hg metaedit -m 'merge, metaedit'
60 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 64 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
65 $ hg log -r . -T '{rev}: {join(extras, " ")}\n'
66 5: amend_source=[0-9a-f]+ branch=default (re)
61 $ hg diff -r 'p1(.)' -r '.' 67 $ hg diff -r 'p1(.)' -r '.'
62 diff -r 88a060ab6523 -r 1528d42f3e83 banana 68 diff -r 88a060ab6523 -r 1528d42f3e83 banana
63 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 69 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
64 +++ b/banana Thu Jan 01 00:00:00 1970 +0000 70 +++ b/banana Thu Jan 01 00:00:00 1970 +0000
65 @@ -0,0 +1,1 @@ 71 @@ -0,0 +1,1 @@
74 topics 80 topics
75 81
76 $ hg topics -r . foo 82 $ hg topics -r . foo
77 switching to topic foo 83 switching to topic foo
78 changed topic on 1 changesets to "foo" 84 changed topic on 1 changesets to "foo"
85 $ hg log -r . -T '{rev}: {join(extras, " ")}\n'
86 6: _rewrite_noise=[0-9a-f]+ branch=default topic=foo (re)
79 $ hg diff -r 'p1(.)' -r '.' 87 $ hg diff -r 'p1(.)' -r '.'
80 diff -r 88a060ab6523 -r 52150b9639f7 banana 88 diff -r 88a060ab6523 -r 52150b9639f7 banana
81 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 89 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
82 +++ b/banana Thu Jan 01 00:00:00 1970 +0000 90 +++ b/banana Thu Jan 01 00:00:00 1970 +0000
83 @@ -0,0 +1,1 @@ 91 @@ -0,0 +1,1 @@