Show More
@@ -436,3 +436,32 b' rollback should not work after a histedi' | |||
|
436 | 436 | $ HGEDITOR=true hg histedit --continue |
|
437 | 437 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
438 | 438 | saved backup bundle to $TESTTMP/r0/.hg/strip-backup/cb9a9f314b8b-cc5ccb0b-backup.hg (glob) |
|
439 | ||
|
440 | $ hg log -G | |
|
441 | @ changeset: 0:0efcea34f18a | |
|
442 | tag: tip | |
|
443 | user: test | |
|
444 | date: Thu Jan 01 00:00:00 1970 +0000 | |
|
445 | summary: a | |
|
446 | ||
|
447 | $ echo foo >> b | |
|
448 | $ hg addr | |
|
449 | adding b | |
|
450 | $ hg ci -m 'add b' | |
|
451 | $ echo foo >> a | |
|
452 | $ hg ci -m 'extend a' | |
|
453 | $ hg phase --public 1 | |
|
454 | Attempting to fold a change into a public change should not work: | |
|
455 | $ cat > ../edit.sh <<EOF | |
|
456 | > cat "\$1" | sed s/pick/fold/ > tmp | |
|
457 | > mv tmp "\$1" | |
|
458 | > EOF | |
|
459 | (BROKEN) | |
|
460 | $ HGEDITOR="sh ../edit.sh" hg histedit 2 | |
|
461 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
462 | reverting a | |
|
463 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
|
464 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
465 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
466 | saved backup bundle to $TESTTMP/r0/.hg/strip-backup/18aa70c8ad22-3aea8ae3-backup.hg (glob) | |
|
467 | (BROKEN) |
General Comments 0
You need to be logged in to leave comments.
Login now