Mercurial > public > mercurial-scm > hg
diff tests/test-commit-amend.t @ 17473:9732473aa24b
amend: use an explicit commit message for temporary amending commit
Before this changeset, the extra commit created during amend had
the same description as the final commit. This was a bit confusing
when trying to understand what that extra commit was about.
This changeset changes the description of such commit to:
temporary amend commit for <ammend-commit-hash>
The old behaviour was not a big deal, but would become more confusing
once we use obsolescence marker instead of stripping the precursors.
This also helps if the user restores a strip backup.
| author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
|---|---|
| date | Sat, 25 Aug 2012 16:20:41 +0200 |
| parents | 8085fed2bf0a |
| children | 63e45aee46d4 |
line wrap: on
line diff
--- a/tests/test-commit-amend.t Mon Sep 10 23:44:24 2012 +0200 +++ b/tests/test-commit-amend.t Sat Aug 25 16:20:41 2012 +0200 @@ -167,6 +167,8 @@ $ echo a >> a $ HGEDITOR="\"sh\" \"`pwd`/editor.sh\"" hg commit --amend -v amending changeset ffb49186f961 + a + copying changeset a4f8a65b7c6a to ad120869acf0 another precious commit message @@ -177,9 +179,7 @@ HG: branch 'default' HG: changed a a - copying changeset 27f3aacd3011 to ad120869acf0 - a - stripping intermediate changeset 27f3aacd3011 + stripping intermediate changeset a4f8a65b7c6a stripping amended changeset ffb49186f961 2 changesets found saved backup bundle to $TESTTMP/.hg/strip-backup/ffb49186f961-amend-backup.hg (glob)