# HG changeset patch # User Augie Fackler # Date 1433531218 14400 # Node ID f0acc3e0bd322f15c11dc6cd6c5de30879fd7dbc # Parent 7e36c3000ead0aff4427d2e07a8570fe1d8b521e test-histedit-edit: add test that demonstrates bug in issue4704 Durham and I agree that it's a bug you can fold into a change that's not listed in the histedited set, so we'll follow this up with a change that prevents folds as the first edit step. diff -r 7e36c3000ead -r f0acc3e0bd32 tests/test-histedit-edit.t --- a/tests/test-histedit-edit.t Fri Jun 05 15:12:08 2015 -0400 +++ b/tests/test-histedit-edit.t Fri Jun 05 15:06:58 2015 -0400 @@ -436,3 +436,32 @@ $ HGEDITOR=true hg histedit --continue 0 files updated, 0 files merged, 0 files removed, 0 files unresolved saved backup bundle to $TESTTMP/r0/.hg/strip-backup/cb9a9f314b8b-cc5ccb0b-backup.hg (glob) + + $ hg log -G + @ changeset: 0:0efcea34f18a + tag: tip + user: test + date: Thu Jan 01 00:00:00 1970 +0000 + summary: a + + $ echo foo >> b + $ hg addr + adding b + $ hg ci -m 'add b' + $ echo foo >> a + $ hg ci -m 'extend a' + $ hg phase --public 1 +Attempting to fold a change into a public change should not work: + $ cat > ../edit.sh < cat "\$1" | sed s/pick/fold/ > tmp + > mv tmp "\$1" + > EOF +(BROKEN) + $ HGEDITOR="sh ../edit.sh" hg histedit 2 + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + reverting a + 1 files updated, 0 files merged, 1 files removed, 0 files unresolved + 2 files updated, 0 files merged, 0 files removed, 0 files unresolved + 0 files updated, 0 files merged, 0 files removed, 0 files unresolved + saved backup bundle to $TESTTMP/r0/.hg/strip-backup/18aa70c8ad22-3aea8ae3-backup.hg (glob) +(BROKEN)