Mercurial > hg
diff tests/test-histedit-no-change.t @ 18437:358c23e8f1c6
histedit: record histedit source (issue3681)
Have histedit record the hex of the original changeset as already done by:
- graft
- commit --amend
- rebase
My main motivation for adding this is to prevent the creation of obsolescence cycle
(see issue3681).
Note that commit created during edit are not affected yet.
author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
---|---|
date | Wed, 16 Jan 2013 19:14:22 +0100 |
parents | 5f2cacb715dc |
children | 93f3a06b2035 |
line wrap: on
line diff
--- a/tests/test-histedit-no-change.t Wed Jan 16 19:11:06 2013 +0100 +++ b/tests/test-histedit-no-change.t Wed Jan 16 19:14:22 2013 +0100 @@ -96,17 +96,19 @@ When you are finished, run hg histedit --continue to resume. $ continueediting true "(leaving commit message unaltered)" % finalize changeset editing (leaving commit message unaltered) - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + 0 files updated, 0 files merged, 0 files removed, 0 files unresolved + 0 files updated, 0 files merged, 0 files removed, 0 files unresolved + check state of working copy $ hg id - 652413bf663e tip + 794fe033d0a0 tip $ graphlog "log after history editing" % log after history editing - @ 5 652413bf663ef2a641cab26574e46d5f5a64a55a "f" + @ 5 794fe033d0a030f8df77c5de945fca35c9181c30 "f" | - o 4 e860deea161a2f77de56603b340ebbb4536308ae "e" + o 4 04d2fab980779f332dec458cc944f28de8b43435 "e" | o 3 055a42cdd88768532f9cf79daa407fc8d138de9b "d" | @@ -152,12 +154,14 @@ When you are finished, run hg histedit --continue to resume. $ graphlog "log after first edit" % log after first edit - o 5 652413bf663ef2a641cab26574e46d5f5a64a55a "f" + @ 6 e5ae3ca2f1ffdbd89ec41ebc273a231f7c3022f2 "d" | - o 4 e860deea161a2f77de56603b340ebbb4536308ae "e" - | - @ 3 055a42cdd88768532f9cf79daa407fc8d138de9b "d" - | + | o 5 652413bf663ef2a641cab26574e46d5f5a64a55a "f" + | | + | o 4 e860deea161a2f77de56603b340ebbb4536308ae "e" + | | + | o 3 055a42cdd88768532f9cf79daa407fc8d138de9b "d" + |/ o 2 177f92b773850b59254aa5e923436f921b55483b "c" | o 1 d2ae7f538514cd87c17547b0de4cea71fe1af9fb "b"