--- a/tests/test-histedit-fold.t Wed Jan 16 19:11:06 2013 +0100
+++ b/tests/test-histedit-fold.t Wed Jan 16 19:14:22 2013 +0100
@@ -72,18 +72,18 @@
log after edit
$ hg log --graph
- @ changeset: 4:82b0c1ff1777
+ @ changeset: 4:7e0a290363ed
| tag: tip
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: d
|
- o changeset: 3:150aafb44a91
+ o changeset: 3:5e24935bad3d
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: pick e860deea161a e
|
- o changeset: 2:493dc0964412
+ o changeset: 2:ee283cb5f2d5
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: e
@@ -108,6 +108,28 @@
e
f
+
+check histedit_source
+
+ $ hg log --debug --rev 3
+ changeset: 3:5e24935bad3d5a4486de3b90f233e991465ced72
+ phase: draft
+ parent: 2:ee283cb5f2d5955443f23a27b697a04339e9a39a
+ parent: -1:0000000000000000000000000000000000000000
+ manifest: 3:81eede616954057198ead0b2c73b41d1f392829a
+ user: test
+ date: Thu Jan 01 00:00:00 1970 +0000
+ files+: c f
+ extra: branch=default
+ extra: histedit_source=a4f7421b80f79fcc59fff01bcbf4a53d127dd6d3,177f92b773850b59254aa5e923436f921b55483b
+ description:
+ pick e860deea161a e
+ pick 652413bf663e f
+ fold 177f92b77385 c
+ pick 055a42cdd887 d
+
+
+
$ cd ..
folding and creating no new change doesn't break:
@@ -258,7 +280,7 @@
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
saved backup bundle to $TESTTMP/fold-with-dropped/.hg/strip-backup/617f94f13c0f-backup.hg (glob)
$ hg log -G
- @ changeset: 1:e29e02896e6c
+ @ changeset: 1:10c647b2cdd5
| tag: tip
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
@@ -273,7 +295,7 @@
# HG changeset patch
# User test
# Date 0 0
- # Node ID e29e02896e6c2b149d2228a0a64b4f3a9a4237f3
+ # Node ID 10c647b2cdd54db0603ecb99b2ff5ce66d5a5323
# Parent 0189ba417d34df9dda55f88b637dcae9917b5964
+4
***
@@ -281,7 +303,7 @@
***
+6
- diff -r 0189ba417d34 -r e29e02896e6c file
+ diff -r 0189ba417d34 -r 10c647b2cdd5 file
--- a/file Thu Jan 01 00:00:00 1970 +0000
+++ b/file Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +1,6 @@