equal
deleted
inserted
replaced
1 This feature requires use of builtin cvsps! |
1 This feature requires use of builtin cvsps! |
2 |
2 |
3 $ "$TESTDIR/hghave" cvs || exit 80 |
3 $ "$TESTDIR/hghave" cvs || exit 80 |
4 $ echo "[extensions]" >> $HGRCPATH |
4 $ echo "[extensions]" >> $HGRCPATH |
5 $ echo "convert = " >> $HGRCPATH |
5 $ echo "convert = " >> $HGRCPATH |
6 $ echo "graphlog = " >> $HGRCPATH |
|
7 |
6 |
8 create cvs repository with one project |
7 create cvs repository with one project |
9 |
8 |
10 $ mkdir cvsrepo |
9 $ mkdir cvsrepo |
11 $ cd cvsrepo |
10 $ cd cvsrepo |
151 3 add file5 on v1_2 |
150 3 add file5 on v1_2 |
152 2 add file6 on trunk post-v1_2 |
151 2 add file6 on trunk post-v1_2 |
153 1 MERGE from HEAD: add file6 |
152 1 MERGE from HEAD: add file6 |
154 0 MERGE from v1_2: add file5 |
153 0 MERGE from v1_2: add file5 |
155 |
154 |
156 hg glog output (#1) |
155 hg log -G output (#1) |
157 |
156 |
158 $ hg -R proj.hg glog --template "{rev} {desc}\n" |
157 $ hg -R proj.hg log -G --template "{rev} {desc}\n" |
159 o 8 MERGE from v1_2: add file5 |
158 o 8 MERGE from v1_2: add file5 |
160 | |
159 | |
161 | o 7 MERGE from HEAD: add file6 |
160 | o 7 MERGE from HEAD: add file6 |
162 | | |
161 | | |
163 o | 6 add file6 on trunk post-v1_2 |
162 o | 6 add file6 on trunk post-v1_2 |
198 3 add file5 on v1_2 |
197 3 add file5 on v1_2 |
199 2 add file6 on trunk post-v1_2 |
198 2 add file6 on trunk post-v1_2 |
200 1 MERGE from HEAD: add file6 |
199 1 MERGE from HEAD: add file6 |
201 0 MERGE from v1_2: add file5 |
200 0 MERGE from v1_2: add file5 |
202 |
201 |
203 hg glog output (#2) |
202 hg log -G output (#2) |
204 |
203 |
205 $ hg -R proj.hg2 glog --template "{rev} {desc}\n" |
204 $ hg -R proj.hg2 log -G --template "{rev} {desc}\n" |
206 o 8 MERGE from v1_2: add file5 |
205 o 8 MERGE from v1_2: add file5 |
207 | |
206 | |
208 | o 7 MERGE from HEAD: add file6 |
207 | o 7 MERGE from HEAD: add file6 |
209 | | |
208 | | |
210 o | 6 add file6 on trunk post-v1_2 |
209 o | 6 add file6 on trunk post-v1_2 |