equal
deleted
inserted
replaced
143 $ echo '[defaults]' >> $HGRCPATH |
143 $ echo '[defaults]' >> $HGRCPATH |
144 $ echo 'commit=' >> $HGRCPATH |
144 $ echo 'commit=' >> $HGRCPATH |
145 |
145 |
146 Test -u/-d: |
146 Test -u/-d: |
147 |
147 |
148 $ hg ci --amend -u foo -d '1 0' |
148 $ cat > .hg/checkeditform.sh <<EOF |
|
149 > env | grep HGEDITFORM |
|
150 > true |
|
151 > EOF |
|
152 $ HGEDITOR="sh .hg/checkeditform.sh" hg ci --amend -u foo -d '1 0' |
|
153 HGEDITFORM=commit.amend.normal |
149 saved backup bundle to $TESTTMP/.hg/strip-backup/1cd866679df8-amend-backup.hg (glob) |
154 saved backup bundle to $TESTTMP/.hg/strip-backup/1cd866679df8-amend-backup.hg (glob) |
150 $ echo a >> a |
155 $ echo a >> a |
151 $ hg ci --amend -u foo -d '1 0' |
156 $ hg ci --amend -u foo -d '1 0' |
152 saved backup bundle to $TESTTMP/.hg/strip-backup/780e6f23e03d-amend-backup.hg (glob) |
157 saved backup bundle to $TESTTMP/.hg/strip-backup/780e6f23e03d-amend-backup.hg (glob) |
153 $ hg log -r . |
158 $ hg log -r . |
617 aa renamed from a:a80d06849b333b8a3d5c445f8ba3142010dcdc9e |
622 aa renamed from a:a80d06849b333b8a3d5c445f8ba3142010dcdc9e |
618 $ hg debugrename zz |
623 $ hg debugrename zz |
619 zz renamed from z:69a1b67522704ec122181c0890bd16e9d3e7516a |
624 zz renamed from z:69a1b67522704ec122181c0890bd16e9d3e7516a |
620 $ hg debugrename cc |
625 $ hg debugrename cc |
621 cc not renamed |
626 cc not renamed |
622 $ hg ci --amend -m 'merge bar (amend message)' |
627 $ HGEDITOR="sh .hg/checkeditform.sh" hg ci --amend -m 'merge bar (amend message)' --edit |
|
628 HGEDITFORM=commit.amend.merge |
623 $ hg log --config diff.git=1 -pr . |
629 $ hg log --config diff.git=1 -pr . |
624 changeset: 24:832b50f2c271 |
630 changeset: 24:832b50f2c271 |
625 tag: tip |
631 tag: tip |
626 parent: 22:30d96aeaf27b |
632 parent: 22:30d96aeaf27b |
627 parent: 21:1aa437659d19 |
633 parent: 21:1aa437659d19 |