test-commit-amend.t
852 lines
| 21.0 KiB
| text/troff
|
Tads3Lexer
/ tests / test-commit-amend.t
|
r16458 | $ hg init | ||
Setup: | ||||
$ echo a >> a | ||||
$ hg ci -Am 'base' | ||||
adding a | ||||
Refuse to amend public csets: | ||||
$ hg phase -r . -p | ||||
$ hg ci --amend | ||||
abort: cannot amend public changesets | ||||
[255] | ||||
$ hg phase -r . -f -d | ||||
$ echo a >> a | ||||
$ hg ci -Am 'base1' | ||||
Nothing to amend: | ||||
$ hg ci --amend | ||||
nothing changed | ||||
[1] | ||||
|
r17060 | $ cat >> $HGRCPATH <<EOF | ||
> [hooks] | ||||
|
r17462 | > pretxncommit.foo = sh -c "echo \\"pretxncommit \$HG_NODE\\"; hg id -r \$HG_NODE" | ||
|
r17060 | > EOF | ||
|
r17049 | |||
|
r16458 | Amending changeset with changes in working dir: | ||
|
r17924 | (and check that --message does not trigger an editor) | ||
|
r16458 | |||
$ echo a >> a | ||||
|
r17924 | $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit --amend -m 'amend base1' | ||
|
r17811 | pretxncommit 43f1ba15f28a50abf0aae529cf8a16bfced7b149 | ||
43f1ba15f28a tip | ||||
|
r17060 | saved backup bundle to $TESTTMP/.hg/strip-backup/489edb5b847d-amend-backup.hg (glob) | ||
|
r17049 | $ echo 'pretxncommit.foo = ' >> $HGRCPATH | ||
|
r16458 | $ hg diff -c . | ||
|
r17811 | diff -r ad120869acf0 -r 43f1ba15f28a a | ||
|
r16458 | --- a/a Thu Jan 01 00:00:00 1970 +0000 | ||
+++ b/a Thu Jan 01 00:00:00 1970 +0000 | ||||
@@ -1,1 +1,3 @@ | ||||
a | ||||
+a | ||||
+a | ||||
$ hg log | ||||
|
r17811 | changeset: 1:43f1ba15f28a | ||
|
r16458 | tag: tip | ||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: amend base1 | ||||
changeset: 0:ad120869acf0 | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: base | ||||
|
r18197 | Check proper abort for empty message | ||
|
r16458 | |||
|
r18197 | $ cat > editor.sh << '__EOF__' | ||
> #!/bin/sh | ||||
> echo "" > "$1" | ||||
> __EOF__ | ||||
|
r16458 | $ echo b > b | ||
|
r18197 | $ hg add b | ||
$ hg summary | ||||
parent: 1:43f1ba15f28a tip | ||||
amend base1 | ||||
branch: default | ||||
commit: 1 added, 1 unknown | ||||
update: (current) | ||||
$ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit --amend | ||||
transaction abort! | ||||
rollback completed | ||||
abort: empty commit message | ||||
[255] | ||||
$ hg summary | ||||
parent: 1:43f1ba15f28a tip | ||||
amend base1 | ||||
branch: default | ||||
commit: 1 added, 1 unknown | ||||
update: (current) | ||||
Add new file: | ||||
$ hg ci --amend -m 'amend base1 new file' | ||||
|
r17811 | saved backup bundle to $TESTTMP/.hg/strip-backup/43f1ba15f28a-amend-backup.hg (glob) | ||
|
r16458 | |||
Remove file that was added in amended commit: | ||||
|
r17863 | (and test logfile option) | ||
|
r17924 | (and test that logfile option do not trigger an editor) | ||
|
r16458 | |||
$ hg rm b | ||||
|
r17863 | $ echo 'amend base1 remove new file' > ../logfile | ||
|
r17924 | $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg ci --amend --logfile ../logfile | ||
|
r17811 | saved backup bundle to $TESTTMP/.hg/strip-backup/b8e3cb2b3882-amend-backup.hg (glob) | ||
|
r16458 | |||
$ hg cat b | ||||
|
r17811 | b: no such file in rev 74609c7f506e | ||
|
r16458 | [1] | ||
No changes, just a different message: | ||||
$ hg ci -v --amend -m 'no changes, new message' | ||||
|
r17811 | amending changeset 74609c7f506e | ||
copying changeset 74609c7f506e to ad120869acf0 | ||||
|
r16458 | a | ||
|
r17811 | stripping amended changeset 74609c7f506e | ||
|
r16458 | 1 changesets found | ||
|
r17811 | saved backup bundle to $TESTTMP/.hg/strip-backup/74609c7f506e-amend-backup.hg (glob) | ||
|
r16458 | 1 changesets found | ||
adding branch | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
added 1 changesets with 1 changes to 1 files | ||||
|
r17811 | committed changeset 1:1cd866679df8 | ||
|
r16458 | $ hg diff -c . | ||
|
r17811 | diff -r ad120869acf0 -r 1cd866679df8 a | ||
|
r16458 | --- a/a Thu Jan 01 00:00:00 1970 +0000 | ||
+++ b/a Thu Jan 01 00:00:00 1970 +0000 | ||||
@@ -1,1 +1,3 @@ | ||||
a | ||||
+a | ||||
+a | ||||
$ hg log | ||||
|
r17811 | changeset: 1:1cd866679df8 | ||
|
r16458 | tag: tip | ||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: no changes, new message | ||||
changeset: 0:ad120869acf0 | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: base | ||||
Disable default date on commit so when -d isn't given, the old date is preserved: | ||||
$ echo '[defaults]' >> $HGRCPATH | ||||
$ echo 'commit=' >> $HGRCPATH | ||||
Test -u/-d: | ||||
$ hg ci --amend -u foo -d '1 0' | ||||
|
r17811 | saved backup bundle to $TESTTMP/.hg/strip-backup/1cd866679df8-amend-backup.hg (glob) | ||
|
r16458 | $ echo a >> a | ||
$ hg ci --amend -u foo -d '1 0' | ||||
|
r17811 | saved backup bundle to $TESTTMP/.hg/strip-backup/780e6f23e03d-amend-backup.hg (glob) | ||
|
r16458 | $ hg log -r . | ||
|
r17811 | changeset: 1:5f357c7560ab | ||
|
r16458 | tag: tip | ||
user: foo | ||||
date: Thu Jan 01 00:00:01 1970 +0000 | ||||
summary: no changes, new message | ||||
Open editor with old commit message if a message isn't given otherwise: | ||||
|
r16901 | $ cat > editor.sh << '__EOF__' | ||
|
r16458 | > #!/bin/sh | ||
> cat $1 | ||||
> echo "another precious commit message" > "$1" | ||||
> __EOF__ | ||||
|
r20771 | |||
at first, test saving last-message.txt | ||||
$ cat > .hg/hgrc << '__EOF__' | ||||
> [hooks] | ||||
> pretxncommit.test-saving-last-message = false | ||||
> __EOF__ | ||||
$ rm -f .hg/last-message.txt | ||||
$ hg commit --amend -v -m "message given from command line" | ||||
amending changeset 5f357c7560ab | ||||
copying changeset 5f357c7560ab to ad120869acf0 | ||||
a | ||||
running hook pretxncommit.test-saving-last-message: false | ||||
transaction abort! | ||||
rollback completed | ||||
abort: pretxncommit.test-saving-last-message hook exited with status 1 | ||||
[255] | ||||
$ cat .hg/last-message.txt | ||||
message given from command line (no-eol) | ||||
$ rm -f .hg/last-message.txt | ||||
$ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit --amend -v | ||||
amending changeset 5f357c7560ab | ||||
copying changeset 5f357c7560ab to ad120869acf0 | ||||
no changes, new message | ||||
HG: Enter commit message. Lines beginning with 'HG:' are removed. | ||||
HG: Leave message empty to abort commit. | ||||
HG: -- | ||||
HG: user: foo | ||||
HG: branch 'default' | ||||
HG: changed a | ||||
a | ||||
running hook pretxncommit.test-saving-last-message: false | ||||
transaction abort! | ||||
rollback completed | ||||
abort: pretxncommit.test-saving-last-message hook exited with status 1 | ||||
[255] | ||||
$ cat .hg/last-message.txt | ||||
another precious commit message | ||||
$ cat > .hg/hgrc << '__EOF__' | ||||
> [hooks] | ||||
> pretxncommit.test-saving-last-message = | ||||
> __EOF__ | ||||
then, test editing custom commit message | ||||
|
r16901 | $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit --amend -v | ||
|
r17811 | amending changeset 5f357c7560ab | ||
copying changeset 5f357c7560ab to ad120869acf0 | ||||
|
r16458 | no changes, new message | ||
HG: Enter commit message. Lines beginning with 'HG:' are removed. | ||||
HG: Leave message empty to abort commit. | ||||
HG: -- | ||||
HG: user: foo | ||||
HG: branch 'default' | ||||
HG: changed a | ||||
a | ||||
|
r17811 | stripping amended changeset 5f357c7560ab | ||
|
r16458 | 1 changesets found | ||
|
r17811 | saved backup bundle to $TESTTMP/.hg/strip-backup/5f357c7560ab-amend-backup.hg (glob) | ||
|
r16458 | 1 changesets found | ||
adding branch | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
added 1 changesets with 1 changes to 1 files | ||||
|
r17811 | committed changeset 1:7ab3bf440b54 | ||
|
r16458 | |||
Same, but with changes in working dir (different code path): | ||||
$ echo a >> a | ||||
|
r16901 | $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit --amend -v | ||
|
r17811 | amending changeset 7ab3bf440b54 | ||
|
r17473 | a | ||
|
r17811 | copying changeset a0ea9b1a4c8c to ad120869acf0 | ||
|
r16458 | another precious commit message | ||
HG: Enter commit message. Lines beginning with 'HG:' are removed. | ||||
HG: Leave message empty to abort commit. | ||||
HG: -- | ||||
HG: user: foo | ||||
HG: branch 'default' | ||||
HG: changed a | ||||
a | ||||
|
r17811 | stripping intermediate changeset a0ea9b1a4c8c | ||
stripping amended changeset 7ab3bf440b54 | ||||
|
r16458 | 2 changesets found | ||
|
r17811 | saved backup bundle to $TESTTMP/.hg/strip-backup/7ab3bf440b54-amend-backup.hg (glob) | ||
|
r16458 | 1 changesets found | ||
adding branch | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
added 1 changesets with 1 changes to 1 files | ||||
|
r17811 | committed changeset 1:ea22a388757c | ||
|
r16458 | |||
|
r16901 | $ rm editor.sh | ||
|
r16458 | $ hg log -r . | ||
|
r17811 | changeset: 1:ea22a388757c | ||
|
r16458 | tag: tip | ||
user: foo | ||||
date: Thu Jan 01 00:00:01 1970 +0000 | ||||
summary: another precious commit message | ||||
Moving bookmarks, preserve active bookmark: | ||||
$ hg book book1 | ||||
$ hg book book2 | ||||
$ hg ci --amend -m 'move bookmarks' | ||||
|
r17811 | saved backup bundle to $TESTTMP/.hg/strip-backup/ea22a388757c-amend-backup.hg (glob) | ||
|
r16458 | $ hg book | ||
|
r17811 | book1 1:6cec5aa930e2 | ||
* book2 1:6cec5aa930e2 | ||||
|
r16458 | $ echo a >> a | ||
$ hg ci --amend -m 'move bookmarks' | ||||
|
r17811 | saved backup bundle to $TESTTMP/.hg/strip-backup/6cec5aa930e2-amend-backup.hg (glob) | ||
|
r16458 | $ hg book | ||
|
r17811 | book1 1:48bb6e53a15f | ||
* book2 1:48bb6e53a15f | ||||
|
r16458 | |||
|
r18198 | abort does not loose bookmarks | ||
$ cat > editor.sh << '__EOF__' | ||||
> #!/bin/sh | ||||
> echo "" > "$1" | ||||
> __EOF__ | ||||
$ echo a >> a | ||||
$ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit --amend | ||||
transaction abort! | ||||
rollback completed | ||||
abort: empty commit message | ||||
[255] | ||||
$ hg book | ||||
book1 1:48bb6e53a15f | ||||
* book2 1:48bb6e53a15f | ||||
$ hg revert -Caq | ||||
$ rm editor.sh | ||||
|
r16458 | $ echo '[defaults]' >> $HGRCPATH | ||
$ echo "commit=-d '0 0'" >> $HGRCPATH | ||||
Moving branches: | ||||
$ hg branch foo | ||||
marked working directory as branch foo | ||||
(branches are permanent and global, did you want a bookmark?) | ||||
$ echo a >> a | ||||
$ hg ci -m 'branch foo' | ||||
$ hg branch default -f | ||||
marked working directory as branch default | ||||
(branches are permanent and global, did you want a bookmark?) | ||||
$ hg ci --amend -m 'back to default' | ||||
|
r17811 | saved backup bundle to $TESTTMP/.hg/strip-backup/8ac881fbf49d-amend-backup.hg (glob) | ||
|
r16458 | $ hg branches | ||
|
r17811 | default 2:ce12b0b57d46 | ||
|
r16458 | |||
Close branch: | ||||
$ hg up -q 0 | ||||
$ echo b >> b | ||||
$ hg branch foo | ||||
marked working directory as branch foo | ||||
(branches are permanent and global, did you want a bookmark?) | ||||
$ hg ci -Am 'fork' | ||||
adding b | ||||
$ echo b >> b | ||||
$ hg ci -mb | ||||
$ hg ci --amend --close-branch -m 'closing branch foo' | ||||
|
r16900 | saved backup bundle to $TESTTMP/.hg/strip-backup/c962248fa264-amend-backup.hg (glob) | ||
|
r16458 | |||
Same thing, different code path: | ||||
$ echo b >> b | ||||
$ hg ci -m 'reopen branch' | ||||
reopening closed branch head 4 | ||||
$ echo b >> b | ||||
$ hg ci --amend --close-branch | ||||
|
r17811 | saved backup bundle to $TESTTMP/.hg/strip-backup/027371728205-amend-backup.hg (glob) | ||
|
r16458 | $ hg branches | ||
|
r17811 | default 2:ce12b0b57d46 | ||
|
r16458 | |||
|
r18909 | Refuse to amend during a merge: | ||
|
r16458 | |||
$ hg up -q default | ||||
$ hg merge foo | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
(branch merge, don't forget to commit) | ||||
$ hg ci --amend | ||||
abort: cannot amend while merging | ||||
[255] | ||||
$ hg ci -m 'merge' | ||||
Follow copies/renames: | ||||
$ hg mv b c | ||||
$ hg ci -m 'b -> c' | ||||
$ hg mv c d | ||||
$ hg ci --amend -m 'b -> d' | ||||
|
r17811 | saved backup bundle to $TESTTMP/.hg/strip-backup/b8c6eac7f12e-amend-backup.hg (glob) | ||
|
r16483 | $ hg st --rev '.^' --copies d | ||
|
r16458 | A d | ||
b | ||||
$ hg cp d e | ||||
$ hg ci -m 'e = d' | ||||
$ hg cp e f | ||||
$ hg ci --amend -m 'f = d' | ||||
|
r17811 | saved backup bundle to $TESTTMP/.hg/strip-backup/7f9761d65613-amend-backup.hg (glob) | ||
|
r16483 | $ hg st --rev '.^' --copies f | ||
|
r16458 | A f | ||
d | ||||
|
r16552 | $ mv f f.orig | ||
$ hg rm -A f | ||||
$ hg ci -m removef | ||||
$ hg cp a f | ||||
$ mv f.orig f | ||||
$ hg ci --amend -m replacef | ||||
|
r17811 | saved backup bundle to $TESTTMP/.hg/strip-backup/9e8c5f7e3d95-amend-backup.hg (glob) | ||
|
r16552 | $ hg st --change . --copies | ||
$ hg log -r . --template "{file_copies}\n" | ||||
|
r16553 | |||
Move added file (issue3410): | ||||
$ echo g >> g | ||||
$ hg ci -Am g | ||||
adding g | ||||
$ hg mv g h | ||||
$ hg ci --amend | ||||
|
r17811 | saved backup bundle to $TESTTMP/.hg/strip-backup/24aa8eacce2b-amend-backup.hg (glob) | ||
|
r16553 | $ hg st --change . --copies h | ||
A h | ||||
$ hg log -r . --template "{file_copies}\n" | ||||
|
r16552 | |||
|
r16458 | Can't rollback an amend: | ||
$ hg rollback | ||||
no rollback information available | ||||
[1] | ||||
|
r16630 | |||
Preserve extra dict (issue3430): | ||||
$ hg branch a | ||||
marked working directory as branch a | ||||
(branches are permanent and global, did you want a bookmark?) | ||||
$ echo a >> a | ||||
$ hg ci -ma | ||||
$ hg ci --amend -m "a'" | ||||
|
r17811 | saved backup bundle to $TESTTMP/.hg/strip-backup/3837aa2a2fdb-amend-backup.hg (glob) | ||
|
r16630 | $ hg log -r . --template "{branch}\n" | ||
a | ||||
$ hg ci --amend -m "a''" | ||||
|
r17811 | saved backup bundle to $TESTTMP/.hg/strip-backup/c05c06be7514-amend-backup.hg (glob) | ||
|
r16630 | $ hg log -r . --template "{branch}\n" | ||
a | ||||
Also preserve other entries in the dict that are in the old commit, | ||||
first graft something so there's an additional entry: | ||||
$ hg up 0 -q | ||||
$ echo z > z | ||||
$ hg ci -Am 'fork' | ||||
adding z | ||||
created new head | ||||
$ hg up 11 | ||||
5 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
$ hg graft 12 | ||||
grafting revision 12 | ||||
$ hg ci --amend -m 'graft amend' | ||||
|
r17811 | saved backup bundle to $TESTTMP/.hg/strip-backup/bd010aea3f39-amend-backup.hg (glob) | ||
|
r16630 | $ hg log -r . --debug | grep extra | ||
|
r17811 | extra: amend_source=bd010aea3f39f3fb2a2f884b9ccb0471cd77398e | ||
|
r16630 | extra: branch=a | ||
extra: source=2647734878ef0236dda712fae9c1651cf694ea8a | ||||
|
r17461 | |||
Preserve phase | ||||
$ hg phase '.^::.' | ||||
11: draft | ||||
13: draft | ||||
$ hg phase --secret --force . | ||||
$ hg phase '.^::.' | ||||
11: draft | ||||
13: secret | ||||
$ hg commit --amend -m 'amend for phase' -q | ||||
$ hg phase '.^::.' | ||||
11: draft | ||||
13: secret | ||||
|
r17475 | Test amend with obsolete | ||
--------------------------- | ||||
Enable obsolete | ||||
$ cat > ${TESTTMP}/obs.py << EOF | ||||
> import mercurial.obsolete | ||||
> mercurial.obsolete._enabled = True | ||||
> EOF | ||||
$ echo '[extensions]' >> $HGRCPATH | ||||
$ echo "obs=${TESTTMP}/obs.py" >> $HGRCPATH | ||||
Amend with no files changes | ||||
$ hg id -n | ||||
13 | ||||
$ hg ci --amend -m 'babar' | ||||
$ hg id -n | ||||
14 | ||||
$ hg log -Gl 3 --style=compact | ||||
|
r17811 | @ 14[tip]:11 b650e6ee8614 1970-01-01 00:00 +0000 test | ||
|
r17475 | | babar | ||
| | ||||
| o 12:0 2647734878ef 1970-01-01 00:00 +0000 test | ||||
| | fork | ||||
| | | ||||
|
r17811 | o | 11 3334b7925910 1970-01-01 00:00 +0000 test | ||
|
r17475 | | | a'' | ||
| | | ||||
$ hg log -Gl 4 --hidden --style=compact | ||||
|
r17811 | @ 14[tip]:11 b650e6ee8614 1970-01-01 00:00 +0000 test | ||
|
r17475 | | babar | ||
| | ||||
|
r17811 | | x 13:11 68ff8ff97044 1970-01-01 00:00 +0000 test | ||
|
r17475 | |/ amend for phase | ||
| | ||||
| o 12:0 2647734878ef 1970-01-01 00:00 +0000 test | ||||
| | fork | ||||
| | | ||||
|
r17811 | o | 11 3334b7925910 1970-01-01 00:00 +0000 test | ||
|
r17475 | | | a'' | ||
| | | ||||
Amend with files changes | ||||
(note: the extra commit over 15 is a temporary junk I would be happy to get | ||||
ride of) | ||||
$ echo 'babar' >> a | ||||
$ hg commit --amend | ||||
$ hg log -Gl 6 --hidden --style=compact | ||||
|
r17811 | @ 16[tip]:11 9f9e9bccf56c 1970-01-01 00:00 +0000 test | ||
|
r17475 | | babar | ||
| | ||||
|
r17811 | | x 15 90fef497c56f 1970-01-01 00:00 +0000 test | ||
| | temporary amend commit for b650e6ee8614 | ||||
|
r17475 | | | | ||
|
r17811 | | x 14:11 b650e6ee8614 1970-01-01 00:00 +0000 test | ||
|
r17475 | |/ babar | ||
| | ||||
|
r17811 | | x 13:11 68ff8ff97044 1970-01-01 00:00 +0000 test | ||
|
r17475 | |/ amend for phase | ||
| | ||||
| o 12:0 2647734878ef 1970-01-01 00:00 +0000 test | ||||
| | fork | ||||
| | | ||||
|
r17811 | o | 11 3334b7925910 1970-01-01 00:00 +0000 test | ||
|
r17475 | | | a'' | ||
| | | ||||
|
r18399 | Test that amend does not make it easy to create obsolescence cycle | ||
|
r17811 | --------------------------------------------------------------------- | ||
|
r18267 | $ hg id -r 14 --hidden | ||
|
r17811 | b650e6ee8614 (a) | ||
|
r18267 | $ hg revert -ar 14 --hidden | ||
|
r17811 | reverting a | ||
$ hg commit --amend | ||||
$ hg id | ||||
b99e5df575f7 (a) tip | ||||
|
r18163 | |||
|
r18398 | Test that rewriting leaving instability behind is allowed | ||
|
r18163 | --------------------------------------------------------------------- | ||
$ hg up '.^' | ||||
0 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
$ echo 'b' >> a | ||||
$ hg log --style compact -r 'children(.)' | ||||
18[tip]:11 b99e5df575f7 1970-01-01 00:00 +0000 test | ||||
babar | ||||
$ hg commit --amend | ||||
$ hg log -r 'unstable()' | ||||
changeset: 18:b99e5df575f7 | ||||
branch: a | ||||
parent: 11:3334b7925910 | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: babar | ||||
|
r18909 | |||
Amend a merge changeset (with renames and conflicts from the second parent): | ||||
$ hg up -q default | ||||
$ hg branch -q bar | ||||
$ hg cp a aa | ||||
$ hg mv z zz | ||||
$ echo cc > cc | ||||
$ hg add cc | ||||
$ hg ci -m aazzcc | ||||
$ hg up -q default | ||||
$ echo a >> a | ||||
$ echo dd > cc | ||||
$ hg add cc | ||||
$ hg ci -m aa | ||||
$ hg merge -q bar | ||||
warning: conflicts during merge. | ||||
merging cc incomplete! (edit conflicts, then use 'hg resolve --mark') | ||||
[1] | ||||
$ hg resolve -m cc | ||||
|
r21267 | no more unresolved files | ||
|
r18909 | $ hg ci -m 'merge bar' | ||
$ hg log --config diff.git=1 -pr . | ||||
|
r21693 | changeset: 23:93cd4445f720 | ||
|
r18909 | tag: tip | ||
parent: 22:30d96aeaf27b | ||||
parent: 21:1aa437659d19 | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: merge bar | ||||
diff --git a/a b/aa | ||||
copy from a | ||||
copy to aa | ||||
diff --git a/cc b/cc | ||||
--- a/cc | ||||
+++ b/cc | ||||
@@ -1,1 +1,5 @@ | ||||
|
r21693 | +<<<<<<< local: 30d96aeaf27b - test: aa | ||
|
r18909 | dd | ||
+======= | ||||
+cc | ||||
|
r21693 | +>>>>>>> other: 1aa437659d19 bar - test: aazzcc | ||
|
r18909 | diff --git a/z b/zz | ||
rename from z | ||||
rename to zz | ||||
$ hg debugrename aa | ||||
aa renamed from a:a80d06849b333b8a3d5c445f8ba3142010dcdc9e | ||||
$ hg debugrename zz | ||||
zz renamed from z:69a1b67522704ec122181c0890bd16e9d3e7516a | ||||
$ hg debugrename cc | ||||
cc not renamed | ||||
$ hg ci --amend -m 'merge bar (amend message)' | ||||
$ hg log --config diff.git=1 -pr . | ||||
|
r21693 | changeset: 24:832b50f2c271 | ||
|
r18909 | tag: tip | ||
parent: 22:30d96aeaf27b | ||||
parent: 21:1aa437659d19 | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: merge bar (amend message) | ||||
diff --git a/a b/aa | ||||
copy from a | ||||
copy to aa | ||||
diff --git a/cc b/cc | ||||
--- a/cc | ||||
+++ b/cc | ||||
@@ -1,1 +1,5 @@ | ||||
|
r21693 | +<<<<<<< local: 30d96aeaf27b - test: aa | ||
|
r18909 | dd | ||
+======= | ||||
+cc | ||||
|
r21693 | +>>>>>>> other: 1aa437659d19 bar - test: aazzcc | ||
|
r18909 | diff --git a/z b/zz | ||
rename from z | ||||
rename to zz | ||||
$ hg debugrename aa | ||||
aa renamed from a:a80d06849b333b8a3d5c445f8ba3142010dcdc9e | ||||
$ hg debugrename zz | ||||
zz renamed from z:69a1b67522704ec122181c0890bd16e9d3e7516a | ||||
$ hg debugrename cc | ||||
cc not renamed | ||||
$ hg mv zz z | ||||
$ hg ci --amend -m 'merge bar (undo rename)' | ||||
$ hg log --config diff.git=1 -pr . | ||||
|
r21693 | changeset: 26:bdafc5c72f74 | ||
|
r18909 | tag: tip | ||
parent: 22:30d96aeaf27b | ||||
parent: 21:1aa437659d19 | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: merge bar (undo rename) | ||||
diff --git a/a b/aa | ||||
copy from a | ||||
copy to aa | ||||
diff --git a/cc b/cc | ||||
--- a/cc | ||||
+++ b/cc | ||||
@@ -1,1 +1,5 @@ | ||||
|
r21693 | +<<<<<<< local: 30d96aeaf27b - test: aa | ||
|
r18909 | dd | ||
+======= | ||||
+cc | ||||
|
r21693 | +>>>>>>> other: 1aa437659d19 bar - test: aazzcc | ||
|
r18909 | |||
$ hg debugrename z | ||||
z not renamed | ||||
Amend a merge changeset (with renames during the merge): | ||||
$ hg up -q bar | ||||
$ echo x > x | ||||
$ hg add x | ||||
$ hg ci -m x | ||||
$ hg up -q default | ||||
$ hg merge -q bar | ||||
$ hg mv aa aaa | ||||
$ echo aa >> aaa | ||||
$ hg ci -m 'merge bar again' | ||||
$ hg log --config diff.git=1 -pr . | ||||
|
r21693 | changeset: 28:32f19415b634 | ||
|
r18909 | tag: tip | ||
|
r21693 | parent: 26:bdafc5c72f74 | ||
|
r18909 | parent: 27:4c94d5bc65f5 | ||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: merge bar again | ||||
diff --git a/aa b/aa | ||||
deleted file mode 100644 | ||||
--- a/aa | ||||
+++ /dev/null | ||||
@@ -1,2 +0,0 @@ | ||||
-a | ||||
-a | ||||
diff --git a/aaa b/aaa | ||||
new file mode 100644 | ||||
--- /dev/null | ||||
+++ b/aaa | ||||
@@ -0,0 +1,3 @@ | ||||
+a | ||||
+a | ||||
+aa | ||||
diff --git a/x b/x | ||||
new file mode 100644 | ||||
--- /dev/null | ||||
+++ b/x | ||||
@@ -0,0 +1,1 @@ | ||||
+x | ||||
$ hg debugrename aaa | ||||
aaa renamed from aa:37d9b5d994eab34eda9c16b195ace52c7b129980 | ||||
$ hg mv aaa aa | ||||
$ hg ci --amend -m 'merge bar again (undo rename)' | ||||
$ hg log --config diff.git=1 -pr . | ||||
|
r21693 | changeset: 30:1e2a06b3d312 | ||
|
r18909 | tag: tip | ||
|
r21693 | parent: 26:bdafc5c72f74 | ||
|
r18909 | parent: 27:4c94d5bc65f5 | ||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: merge bar again (undo rename) | ||||
diff --git a/aa b/aa | ||||
--- a/aa | ||||
+++ b/aa | ||||
@@ -1,2 +1,3 @@ | ||||
a | ||||
a | ||||
+aa | ||||
diff --git a/x b/x | ||||
new file mode 100644 | ||||
--- /dev/null | ||||
+++ b/x | ||||
@@ -0,0 +1,1 @@ | ||||
+x | ||||
$ hg debugrename aa | ||||
aa not renamed | ||||
|
r18912 | $ hg debugrename -r '.^' aa | ||
|
r18909 | aa renamed from a:a80d06849b333b8a3d5c445f8ba3142010dcdc9e | ||
Amend a merge changeset (with manifest-level conflicts): | ||||
$ hg up -q bar | ||||
$ hg rm aa | ||||
$ hg ci -m 'rm aa' | ||||
$ hg up -q default | ||||
$ echo aa >> aa | ||||
$ hg ci -m aa | ||||
$ hg merge -q bar | ||||
local changed aa which remote deleted | ||||
use (c)hanged version or (d)elete? c | ||||
$ hg ci -m 'merge bar (with conflicts)' | ||||
$ hg log --config diff.git=1 -pr . | ||||
|
r21693 | changeset: 33:97a298b0c59f | ||
|
r18909 | tag: tip | ||
|
r21693 | parent: 32:3d78ce4226b8 | ||
|
r18909 | parent: 31:67db8847a540 | ||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: merge bar (with conflicts) | ||||
$ hg rm aa | ||||
$ hg ci --amend -m 'merge bar (with conflicts, amended)' | ||||
$ hg log --config diff.git=1 -pr . | ||||
|
r21693 | changeset: 35:6de0c1bde1c8 | ||
|
r18909 | tag: tip | ||
|
r21693 | parent: 32:3d78ce4226b8 | ||
|
r18909 | parent: 31:67db8847a540 | ||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: merge bar (with conflicts, amended) | ||||
diff --git a/aa b/aa | ||||
deleted file mode 100644 | ||||
--- a/aa | ||||
+++ /dev/null | ||||
@@ -1,4 +0,0 @@ | ||||
-a | ||||
-a | ||||
-aa | ||||
-aa | ||||
|
r19305 | Issue 3445: amending with --close-branch a commit that created a new head should fail | ||
This shouldn't be possible: | ||||
$ hg up -q default | ||||
$ hg branch closewithamend | ||||
marked working directory as branch closewithamend | ||||
(branches are permanent and global, did you want a bookmark?) | ||||
|
r19980 | $ hg add obs.py | ||
$ hg ci -m.. | ||||
|
r19305 | $ hg ci --amend --close-branch -m 'closing' | ||
abort: can only close branch heads | ||||
[255] | ||||
This silliness fails: | ||||
$ hg branch silliness | ||||
marked working directory as branch silliness | ||||
(branches are permanent and global, did you want a bookmark?) | ||||
$ echo b >> b | ||||
$ hg ci --close-branch -m'open and close' | ||||
abort: can only close branch heads | ||||
[255] | ||||
|
r20700 | |||
Test that amend with --secret creates new secret changeset forcibly | ||||
--------------------------------------------------------------------- | ||||
$ hg phase '.^::.' | ||||
35: draft | ||||
36: draft | ||||
$ hg commit --amend --secret -m 'amend as secret' -q | ||||
$ hg phase '.^::.' | ||||
35: draft | ||||
38: secret | ||||
|
r21036 | |||
Test that amend with --edit invokes editor forcibly | ||||
--------------------------------------------------- | ||||
$ hg parents --template "{desc}\n" | ||||
amend as secret | ||||
$ HGEDITOR=cat hg commit --amend -m "editor should be suppressed" | ||||
$ hg parents --template "{desc}\n" | ||||
editor should be suppressed | ||||
$ HGEDITOR=cat hg commit --amend -m "editor should be invoked" --edit | ||||
editor should be invoked | ||||
HG: Enter commit message. Lines beginning with 'HG:' are removed. | ||||
HG: Leave message empty to abort commit. | ||||
HG: -- | ||||
HG: user: test | ||||
HG: branch 'silliness' | ||||
HG: changed obs.py | ||||
$ hg parents --template "{desc}\n" | ||||
editor should be invoked | ||||