--- a/tests/test-debugbuilddag.t Mon May 02 19:20:29 2011 +0200
+++ b/tests/test-debugbuilddag.t Mon May 02 19:21:30 2011 +0200
@@ -1,12 +1,16 @@
$ echo "[extensions]" >> $HGRCPATH
$ echo "graphlog=" >> $HGRCPATH
-overwritten and appended files
+plain
$ rm -rf repo
$ hg init repo
$ cd repo
- $ hg debugbuilddag '+2:f +3:p2 @temp <f+4 @default /p2 +2' -q -oa
+ $ hg debugbuilddag '+2:f +3:p2 @temp <f+4 @default /p2 +2'
+tags
+ $ cat .hg/localtags
+ 66f7d451a68b85ed82ff5fcc254daf50c74144bd f
+ bebd167eb94d257ace0e814aeb98e6972ed2970d p2
dag
$ hg debugdag -t -b
+2:f
@@ -15,10 +19,56 @@
@default*/p2+2:tip
tip
$ hg id
- f96e381c614c tip
+ 000000000000
glog
$ hg glog --template '{rev}: {desc} [{branches}] @ {date}\n'
- @ 11: r11 [] @ 11.00
+ o 11: r11 [] @ 11.00
+ |
+ o 10: r10 [] @ 10.00
+ |
+ o 9: r9 [] @ 9.00
+ |\
+ | o 8: r8 [temp] @ 8.00
+ | |
+ | o 7: r7 [temp] @ 7.00
+ | |
+ | o 6: r6 [temp] @ 6.00
+ | |
+ | o 5: r5 [temp] @ 5.00
+ | |
+ o | 4: r4 [] @ 4.00
+ | |
+ o | 3: r3 [] @ 3.00
+ | |
+ o | 2: r2 [] @ 2.00
+ |/
+ o 1: r1 [] @ 1.00
+ |
+ o 0: r0 [] @ 0.00
+
+
+overwritten files
+
+ $ rm -rf repo
+ $ hg init repo
+ $ cd repo
+ $ hg debugbuilddag '+2:f +3:p2 @temp <f+4 @default /p2 +2' -q -o
+tags
+ $ cat .hg/localtags
+ 2a8ed67d317e370eac733dccc501b12d7b9c441a f
+ 4226a30965b7af58f94d0cda7e6c2c9c63e6bf90 p2
+dag
+ $ hg debugdag -t -b
+ +2:f
+ +3:p2
+ @temp*f+3
+ @default*/p2+2:tip
+tip
+ $ hg id
+ 000000000000
+glog
+ $ hg glog --template '{rev}: {desc} [{branches}] @ {date}\n'
+ o 11: r11 [] @ 11.00
|
o 10: r10 [] @ 10.00
|
@@ -44,33 +94,7 @@
glog of
$ hg glog --template '{rev}: {desc} [{branches}]\n' of
- @ 11: r11 []
- |
- o 10: r10 []
- |
- o 9: r9 []
- |\
- | o 8: r8 [temp]
- | |
- | o 7: r7 [temp]
- | |
- | o 6: r6 [temp]
- | |
- | o 5: r5 [temp]
- | |
- o | 4: r4 []
- | |
- o | 3: r3 []
- | |
- o | 2: r2 []
- |/
- o 1: r1 []
- |
- o 0: r0 []
-
-glog af
- $ hg glog --template '{rev}: {desc} [{branches}]\n' af
- @ 11: r11 []
+ o 11: r11 []
|
o 10: r10 []
|
@@ -96,25 +120,15 @@
tags
$ hg tags -v
- tip 11:f96e381c614c
- p2 4:d9d6db981b55 local
- f 1:73253def624e local
+ tip 11:58a51e5eb988
+ p2 4:4226a30965b7 local
+ f 1:2a8ed67d317e local
cat of
- $ hg cat of
- r11
-cat af
- $ hg cat af
- r0
- r1
- r5
- r6
- r7
- r8
- r9
- r10
+ $ hg cat of --rev tip
r11
$ cd ..
+
new and mergeable files
$ rm -rf repo
@@ -129,10 +143,10 @@
@default*/p2+2:tip
tip
$ hg id
- 9c5ce9b70771 tip
+ 000000000000
glog
$ hg glog --template '{rev}: {desc} [{branches}] @ {date}\n'
- @ 11: r11 [] @ 11.00
+ o 11: r11 [] @ 11.00
|
o 10: r10 [] @ 10.00
|
@@ -158,7 +172,7 @@
glog mf
$ hg glog --template '{rev}: {desc} [{branches}]\n' mf
- @ 11: r11 []
+ o 11: r11 []
|
o 10: r10 []
|
@@ -253,7 +267,7 @@
22
23
man
- $ hg manifest
+ $ hg manifest --rev tip
mf
nf0
nf1
@@ -268,7 +282,7 @@
nf8
nf9
cat mf
- $ hg cat mf
+ $ hg cat mf --rev tip
0 r0
1
2 r1
@@ -295,27 +309,5 @@
23
$ cd ..
-command
- $ rm -rf repo
- $ hg init repo
- $ cd repo
- $ hg debugbuilddag '+2 !"touch X" +2' -q -o
-dag
- $ hg debugdag -t -b
- +4:tip
-glog
- $ hg glog --template '{rev}: {desc} [{branches}]\n'
- @ 3: r3 []
- |
- o 2: r2 []
- |
- o 1: r1 []
- |
- o 0: r0 []
-
-glog X
- $ hg glog --template '{rev}: {desc} [{branches}]\n' X
- o 2: r2 []
- |
- $ cd ..
+