--- a/tests/test-evolve.t Sun May 11 01:14:34 2014 -0700
+++ b/tests/test-evolve.t Sun May 11 01:17:02 2014 -0700
@@ -1,6 +1,7 @@
$ cat >> $HGRCPATH <<EOF
> [defaults]
> amend=-d "0 0"
+ > fold=-d "0 0"
> [web]
> push_ssl = false
> allow_push = *
@@ -593,7 +594,7 @@
2 changesets folded
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ glog
- @ 11:*@default(draft) add 1 (glob)
+ @ 11:dd4682c1a481@default(draft) add 1
|
o 5:0b9e50c35132@default(draft) add 3
|
@@ -615,16 +616,20 @@
$ hg up 4
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
- $ hg fold --rev 4::11
+ $ hg fold --rev 4::11 --user victor
3 changesets folded
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ glog
- @ 12:*@default(draft) add 4 (glob)
+ @ 12:d26d339c513f@default(draft) add 4
|
| o 1:73d38bb17fd7@default(draft) add 1
|/
o 0:8685c6d34325@default(draft) add 0
+ $ hg log --template '{rev}: {author}\n'
+ 12: victor
+ 1: test
+ 0: test
$ hg log -r 12 --template '{desc}\n'
add 4
@@ -645,3 +650,28 @@
4 : add 4 - test
5 : add 3 - test
11 : add 1 - test
+
+
+Test evolving renames
+
+ $ hg up null
+ 0 files updated, 0 files merged, 4 files removed, 0 files unresolved
+ $ echo a > a
+ $ hg ci -Am a
+ adding a
+ created new head
+ $ echo b > b
+ $ hg ci -Am b
+ adding b
+ $ hg mv a c
+ $ hg ci -m c
+ $ hg kill .^
+ 1 changesets pruned
+ 1 new unstable changesets
+ $ hg stab --any
+ move:[15] c
+ atop:[13] a
+ $ hg st -C --change=tip
+ A c
+ a
+ R a