Mercurial > evolve
diff tests/test-amend-merge.t @ 6031:c3d66af4cb07
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 |
line wrap: on
line diff
--- a/tests/test-amend-merge.t Mon Aug 30 12:04:33 2021 +0300 +++ b/tests/test-amend-merge.t Mon Aug 30 12:55:00 2021 +0300 @@ -25,6 +25,8 @@ (branch merge, don't forget to commit) $ hg ci -m merge + $ hg log -r . -T '{rev}: {join(extras, " ")}\n' + 3: branch=default $ hg diff -r 'p1(.)' -r '.' diff -r 88a060ab6523 -r c20705a6a8c4 banana --- /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -41,6 +43,8 @@ amend $ hg amend -m 'merge, amend' + $ hg log -r . -T '{rev}: {join(extras, " ")}\n' + 4: amend_source=[0-9a-f]+ branch=default (re) $ hg diff -r 'p1(.)' -r '.' diff -r 88a060ab6523 -r 456753fae3cd banana --- /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -58,6 +62,8 @@ $ hg metaedit -m 'merge, metaedit' 0 files updated, 0 files merged, 0 files removed, 0 files unresolved + $ hg log -r . -T '{rev}: {join(extras, " ")}\n' + 5: amend_source=[0-9a-f]+ branch=default (re) $ hg diff -r 'p1(.)' -r '.' diff -r 88a060ab6523 -r 1528d42f3e83 banana --- /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -76,6 +82,8 @@ $ hg topics -r . foo switching to topic foo changed topic on 1 changesets to "foo" + $ hg log -r . -T '{rev}: {join(extras, " ")}\n' + 6: _rewrite_noise=[0-9a-f]+ branch=default topic=foo (re) $ hg diff -r 'p1(.)' -r '.' diff -r 88a060ab6523 -r 52150b9639f7 banana --- /dev/null Thu Jan 01 00:00:00 1970 +0000