Mercurial > public > mercurial-scm > hg
diff tests/test-histedit-commute.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 | a79776f427b4 |
| children | 53060cc1b601 |
line wrap: on
line diff
--- a/tests/test-histedit-commute.t Wed Jan 16 19:11:06 2013 +0100 +++ b/tests/test-histedit-commute.t Wed Jan 16 19:14:22 2013 +0100 @@ -94,18 +94,18 @@ log after edit $ hg log --graph - @ changeset: 5:853c68da763f + @ changeset: 5:07114f51870f | tag: tip | user: test | date: Thu Jan 01 00:00:00 1970 +0000 | summary: d | - o changeset: 4:26f6a030ae82 + o changeset: 4:8ade9693061e | user: test | date: Thu Jan 01 00:00:00 1970 +0000 | summary: f | - o changeset: 3:b069cc29fb22 + o changeset: 3:d8249471110a | user: test | date: Thu Jan 01 00:00:00 1970 +0000 | summary: e @@ -130,9 +130,9 @@ $ cat > $EDITED <<EOF > pick 177f92b77385 c - > pick 853c68da763f d - > pick b069cc29fb22 e - > pick 26f6a030ae82 f + > pick 07114f51870f d + > pick d8249471110a e + > pick 8ade9693061e f > EOF $ HGEDITOR="cat \"$EDITED\" > " hg histedit 177f92b77385 2>&1 | fixbundle 0 files updated, 0 files merged, 3 files removed, 0 files unresolved @@ -141,18 +141,18 @@ 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg log --graph - @ changeset: 5:652413bf663e + @ changeset: 5:7eca9b5b1148 | tag: tip | user: test | date: Thu Jan 01 00:00:00 1970 +0000 | summary: f | - o changeset: 4:e860deea161a + o changeset: 4:915da888f2de | user: test | date: Thu Jan 01 00:00:00 1970 +0000 | summary: e | - o changeset: 3:055a42cdd887 + o changeset: 3:10517e47bbbb | user: test | date: Thu Jan 01 00:00:00 1970 +0000 | summary: d @@ -176,9 +176,9 @@ slightly different this time $ cat > $EDITED <<EOF - > pick 055a42cdd887 d - > pick 652413bf663e f - > pick e860deea161a e + > pick 10517e47bbbb d + > pick 7eca9b5b1148 f + > pick 915da888f2de e > pick 177f92b77385 c > EOF $ HGEDITOR="cat \"$EDITED\" > " hg histedit 177f92b77385 2>&1 | fixbundle @@ -188,23 +188,23 @@ 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg log --graph - @ changeset: 5:99a62755c625 + @ changeset: 5:38b92f448761 | tag: tip | user: test | date: Thu Jan 01 00:00:00 1970 +0000 | summary: c | - o changeset: 4:7c6fdd608667 + o changeset: 4:de71b079d9ce | user: test | date: Thu Jan 01 00:00:00 1970 +0000 | summary: e | - o changeset: 3:c4f52e213402 + o changeset: 3:be9ae3a309c6 | user: test | date: Thu Jan 01 00:00:00 1970 +0000 | summary: f | - o changeset: 2:bfe4a5a76b37 + o changeset: 2:799205341b6b | user: test | date: Thu Jan 01 00:00:00 1970 +0000 | summary: d @@ -222,48 +222,48 @@ keep prevents stripping dead revs $ cat > $EDITED <<EOF - > pick bfe4a5a76b37 d - > pick c4f52e213402 f - > pick 99a62755c625 c - > pick 7c6fdd608667 e + > pick 799205341b6b d + > pick be9ae3a309c6 f + > pick 38b92f448761 c + > pick de71b079d9ce e > EOF - $ HGEDITOR="cat \"$EDITED\" > " hg histedit bfe4a5a76b37 --keep 2>&1 | fixbundle + $ HGEDITOR="cat \"$EDITED\" > " hg histedit 799205341b6b --keep 2>&1 | fixbundle 0 files updated, 0 files merged, 2 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 $ hg log --graph > cat > $EDITED <<EOF - > pick 7c6fdd608667 e - > pick 99a62755c625 c + > pick de71b079d9ce e + > pick 38b92f448761 c > EOF - @ changeset: 7:99e266581538 + @ changeset: 7:803ef1c6fcfd | tag: tip | user: test | date: Thu Jan 01 00:00:00 1970 +0000 | summary: e | - o changeset: 6:5ad36efb0653 - | parent: 3:c4f52e213402 + o changeset: 6:ece0b8d93dda + | parent: 3:be9ae3a309c6 | user: test | date: Thu Jan 01 00:00:00 1970 +0000 | summary: c | - | o changeset: 5:99a62755c625 + | o changeset: 5:38b92f448761 | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 | | summary: c | | - | o changeset: 4:7c6fdd608667 + | o changeset: 4:de71b079d9ce |/ user: test | date: Thu Jan 01 00:00:00 1970 +0000 | summary: e | - o changeset: 3:c4f52e213402 + o changeset: 3:be9ae3a309c6 | user: test | date: Thu Jan 01 00:00:00 1970 +0000 | summary: f | - o changeset: 2:bfe4a5a76b37 + o changeset: 2:799205341b6b | user: test | date: Thu Jan 01 00:00:00 1970 +0000 | summary: d @@ -283,34 +283,34 @@ $ hg histedit --commands "$EDITED" --rev -2 2>&1 | fixbundle abort: may not use changesets other than the ones listed $ hg log --graph - @ changeset: 7:99e266581538 + @ changeset: 7:803ef1c6fcfd | tag: tip | user: test | date: Thu Jan 01 00:00:00 1970 +0000 | summary: e | - o changeset: 6:5ad36efb0653 - | parent: 3:c4f52e213402 + o changeset: 6:ece0b8d93dda + | parent: 3:be9ae3a309c6 | user: test | date: Thu Jan 01 00:00:00 1970 +0000 | summary: c | - | o changeset: 5:99a62755c625 + | o changeset: 5:38b92f448761 | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 | | summary: c | | - | o changeset: 4:7c6fdd608667 + | o changeset: 4:de71b079d9ce |/ user: test | date: Thu Jan 01 00:00:00 1970 +0000 | summary: e | - o changeset: 3:c4f52e213402 + o changeset: 3:be9ae3a309c6 | user: test | date: Thu Jan 01 00:00:00 1970 +0000 | summary: f | - o changeset: 2:bfe4a5a76b37 + o changeset: 2:799205341b6b | user: test | date: Thu Jan 01 00:00:00 1970 +0000 | summary: d