Mercurial > evolve
changeset 5918:13c406d9912c stable
tests: add test-amend-merge.t with a simple merge amended by various commands
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Sun, 09 May 2021 00:09:53 +0800 |
| parents | 94aed9c7ce69 |
| children | 1a8e86053adb |
| files | tests/test-amend-merge.t tests/test-check-sdist.t |
| diffstat | 2 files changed, 73 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-amend-merge.t Sun May 09 00:09:53 2021 +0800 @@ -0,0 +1,72 @@ +This test amends a merge commit using various commands, including topics + + $ . $TESTDIR/testlib/common.sh + + $ cat >> $HGRCPATH << EOF + > [extensions] + > evolve = + > topic = + > EOF + + $ hg init amending-a-merge + $ cd amending-a-merge + + $ mkcommit root + $ mkcommit apple + $ hg up 'desc("root")' + 0 files updated, 0 files merged, 1 files removed, 0 files unresolved + $ mkcommit banana + created new head + (consider using topic for lightweight branches. See 'hg help topic') + $ hg up 'desc("apple")' + 1 files updated, 0 files merged, 1 files removed, 0 files unresolved + $ hg merge 'desc("banana")' + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + (branch merge, don't forget to commit) + + $ hg ci -m merge + $ hg diff -r 'p1(.)' -r '.' + diff -r 88a060ab6523 -r c20705a6a8c4 banana + --- /dev/null Thu Jan 01 00:00:00 1970 +0000 + +++ b/banana Thu Jan 01 00:00:00 1970 +0000 + @@ -0,0 +1,1 @@ + +banana + $ hg diff -r 'p2(.)' -r '.' + diff -r d8c7baf0ca58 -r c20705a6a8c4 apple + --- /dev/null Thu Jan 01 00:00:00 1970 +0000 + +++ b/apple Thu Jan 01 00:00:00 1970 +0000 + @@ -0,0 +1,1 @@ + +apple + +amend + + $ hg amend -m 'merge, amend' + $ hg diff -r 'p1(.)' -r '.' + diff -r 88a060ab6523 -r 456753fae3cd banana + --- /dev/null Thu Jan 01 00:00:00 1970 +0000 + +++ b/banana Thu Jan 01 00:00:00 1970 +0000 + @@ -0,0 +1,1 @@ + +banana + $ hg diff -r 'p2(.)' -r '.' + diff -r d8c7baf0ca58 -r 456753fae3cd apple + --- /dev/null Thu Jan 01 00:00:00 1970 +0000 + +++ b/apple Thu Jan 01 00:00:00 1970 +0000 + @@ -0,0 +1,1 @@ + +apple + +metaedit + + $ hg metaedit -m 'merge, metaedit' + 0 files updated, 0 files merged, 0 files removed, 0 files unresolved + $ hg diff -r 'p1(.)' -r '.' + diff -r 88a060ab6523 -r 1528d42f3e83 banana + --- /dev/null Thu Jan 01 00:00:00 1970 +0000 + +++ b/banana Thu Jan 01 00:00:00 1970 +0000 + @@ -0,0 +1,1 @@ + +banana + $ hg diff -r 'p2(.)' -r '.' + diff -r d8c7baf0ca58 -r 1528d42f3e83 apple + --- /dev/null Thu Jan 01 00:00:00 1970 +0000 + +++ b/apple Thu Jan 01 00:00:00 1970 +0000 + @@ -0,0 +1,1 @@ + +apple
--- a/tests/test-check-sdist.t Sat May 15 20:40:19 2021 +0800 +++ b/tests/test-check-sdist.t Sun May 09 00:09:53 2021 +0800 @@ -35,7 +35,7 @@ $ tar -tzf hg-evolve-*.tar.gz | sed 's|^hg-evolve-[^/]*/||' | sort > files $ wc -l files - 349 files + 350 files $ fgrep debian files tests/test-check-debian.t $ fgrep __init__.py files