Mercurial > hg
diff tests/test-amend.t @ 35163:ee64e677c3cf
merge with stable
author | Augie Fackler <augie@google.com> |
---|---|
date | Thu, 30 Nov 2017 15:48:42 -0500 |
parents | a7e49a5b3e6f 5f40efa472db |
children | 98f97eb20597 |
line wrap: on
line diff
--- a/tests/test-amend.t Wed Nov 22 22:18:06 2017 +0800 +++ b/tests/test-amend.t Thu Nov 30 15:48:42 2017 -0500 @@ -235,3 +235,97 @@ | o A + +More complete test for status changes (issue5732) +------------------------------------------------- + +Generates history of files having 3 states, r0_r1_wc: + + r0: ground (content/missing) + r1: old state to be amended (content/missing, where missing means removed) + wc: changes to be included in r1 (content/missing-tracked/untracked) + + $ hg init $TESTTMP/wcstates + $ cd $TESTTMP/wcstates + + $ $PYTHON $TESTDIR/generate-working-copy-states.py state 2 1 + $ hg addremove -q --similarity 0 + $ hg commit -m0 + + $ $PYTHON $TESTDIR/generate-working-copy-states.py state 2 2 + $ hg addremove -q --similarity 0 + $ hg commit -m1 + + $ $PYTHON $TESTDIR/generate-working-copy-states.py state 2 wc + $ hg addremove -q --similarity 0 + $ hg forget *_*_*-untracked + $ rm *_*_missing-* + +amend r1 to include wc changes + + $ hg amend + saved backup bundle to * (glob) (obsstore-off !) + +clean/modified/removed/added states of the amended revision + + $ hg status --all --change . 'glob:content1_*_content1-tracked' + C content1_content1_content1-tracked + C content1_content2_content1-tracked + C content1_missing_content1-tracked + $ hg status --all --change . 'glob:content1_*_content[23]-tracked' + M content1_content1_content3-tracked + M content1_content2_content2-tracked + M content1_content2_content3-tracked + M content1_missing_content3-tracked + $ hg status --all --change . 'glob:content1_*_missing-tracked' + M content1_content2_missing-tracked + R content1_missing_missing-tracked + C content1_content1_missing-tracked + $ hg status --all --change . 'glob:content1_*_*-untracked' + R content1_content1_content1-untracked + R content1_content1_content3-untracked + R content1_content1_missing-untracked + R content1_content2_content1-untracked + R content1_content2_content2-untracked + R content1_content2_content3-untracked + R content1_content2_missing-untracked + R content1_missing_content1-untracked + R content1_missing_content3-untracked + R content1_missing_missing-untracked + $ hg status --all --change . 'glob:missing_content2_*' + A missing_content2_content2-tracked + A missing_content2_content3-tracked + A missing_content2_missing-tracked + $ hg status --all --change . 'glob:missing_missing_*' + A missing_missing_content3-tracked + +working directory should be all clean (with some missing/untracked files) + + $ hg status --all 'glob:*_content?-tracked' + C content1_content1_content1-tracked + C content1_content1_content3-tracked + C content1_content2_content1-tracked + C content1_content2_content2-tracked + C content1_content2_content3-tracked + C content1_missing_content1-tracked + C content1_missing_content3-tracked + C missing_content2_content2-tracked + C missing_content2_content3-tracked + C missing_missing_content3-tracked + $ hg status --all 'glob:*_missing-tracked' + ! content1_content1_missing-tracked + ! content1_content2_missing-tracked + ! content1_missing_missing-tracked + ! missing_content2_missing-tracked + ! missing_missing_missing-tracked + $ hg status --all 'glob:*-untracked' + ? content1_content1_content1-untracked + ? content1_content1_content3-untracked + ? content1_content2_content1-untracked + ? content1_content2_content2-untracked + ? content1_content2_content3-untracked + ? content1_missing_content1-untracked + ? content1_missing_content3-untracked + ? missing_content2_content2-untracked + ? missing_content2_content3-untracked + ? missing_missing_content3-untracked