--- a/tests/test-convert-datesort.t Sun Mar 24 16:43:25 2013 -0700
+++ b/tests/test-convert-datesort.t Sun Mar 24 00:06:52 2013 +0700
@@ -38,6 +38,26 @@
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo b >> b
$ hg ci -m b1 -d '9 0'
+ $ hg up -C 0
+ 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+ $ echo c >> c
+ $ hg branch branchc
+ marked working directory as branch branchc
+ (branches are permanent and global, did you want a bookmark?)
+ $ hg ci -Am c0 -d '10 0'
+ adding c
+ $ hg up -C brancha
+ 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
+ $ hg ci --close-branch -m a7x -d '11 0'
+ $ hg up -C branchb
+ 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ $ hg ci --close-branch -m b2x -d '12 0'
+ $ hg up -C branchc
+ 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
+ $ hg merge branchb
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ (branch merge, don't forget to commit)
+ $ hg ci -m c1 -d '13 0'
$ cd ..
convert with datesort
@@ -47,27 +67,39 @@
scanning source...
sorting...
converting...
- 8 a0
- 7 a1
- 6 a2
- 5 a3
- 4 a4
- 3 b0
- 2 a5
- 1 a6
- 0 b1
+ 12 a0
+ 11 a1
+ 10 a2
+ 9 a3
+ 8 a4
+ 7 b0
+ 6 a5
+ 5 a6
+ 4 b1
+ 3 c0
+ 2 a7x
+ 1 b2x
+ 0 c1
graph converted repo
$ hg -R t-datesort glog --template '{rev} "{desc}"\n'
- o 8 "b1"
- |
- | o 7 "a6"
+ o 12 "c1"
+ |\
+ | o 11 "b2x"
| |
- | o 6 "a5"
- | |
- o | 5 "b0"
- | |
+ | | o 10 "a7x"
+ | | |
+ o | | 9 "c0"
+ | | |
+ | o | 8 "b1"
+ | | |
+ | | o 7 "a6"
+ | | |
+ | | o 6 "a5"
+ | | |
+ | o | 5 "b0"
+ |/ /
| o 4 "a4"
| |
| o 3 "a3"
@@ -86,29 +118,41 @@
scanning source...
sorting...
converting...
- 8 a0
- 7 a1
- 6 a2
- 5 a3
- 4 b0
- 3 a4
- 2 a5
- 1 a6
- 0 b1
+ 12 a0
+ 11 a1
+ 10 a2
+ 9 a3
+ 8 b0
+ 7 a4
+ 6 a5
+ 5 a6
+ 4 b1
+ 3 c0
+ 2 a7x
+ 1 b2x
+ 0 c1
graph converted repo
$ hg -R t-sourcesort glog --template '{rev} "{desc}"\n'
- o 8 "b1"
- |
- | o 7 "a6"
+ o 12 "c1"
+ |\
+ | o 11 "b2x"
| |
- | o 6 "a5"
- | |
- | o 5 "a4"
- | |
- o | 4 "b0"
- | |
+ | | o 10 "a7x"
+ | | |
+ o | | 9 "c0"
+ | | |
+ | o | 8 "b1"
+ | | |
+ | | o 7 "a6"
+ | | |
+ | | o 6 "a5"
+ | | |
+ | | o 5 "a4"
+ | | |
+ | o | 4 "b0"
+ |/ /
| o 3 "a3"
| |
| o 2 "a2"
@@ -117,3 +161,54 @@
|/
o 0 "a0"
+
+convert with closesort
+
+ $ hg convert --closesort t t-closesort
+ initializing destination t-closesort repository
+ scanning source...
+ sorting...
+ converting...
+ 12 a0
+ 11 a1
+ 10 a2
+ 9 a3
+ 8 b0
+ 7 a4
+ 6 a5
+ 5 a6
+ 4 a7x
+ 3 b1
+ 2 b2x
+ 1 c0
+ 0 c1
+
+graph converted repo
+
+ $ hg -R t-closesort glog --template '{rev} "{desc}"\n'
+ o 12 "c1"
+ |\
+ | o 11 "c0"
+ | |
+ o | 10 "b2x"
+ | |
+ o | 9 "b1"
+ | |
+ | | o 8 "a7x"
+ | | |
+ | | o 7 "a6"
+ | | |
+ | | o 6 "a5"
+ | | |
+ | | o 5 "a4"
+ | | |
+ o | | 4 "b0"
+ |/ /
+ | o 3 "a3"
+ | |
+ | o 2 "a2"
+ | |
+ | o 1 "a1"
+ |/
+ o 0 "a0"
+