equal
deleted
inserted
replaced
22 |
22 |
23 XXX copied from test-convert-cvs-synthetic |
23 XXX copied from test-convert-cvs-synthetic |
24 |
24 |
25 $ echo "[extensions]" >> $HGRCPATH |
25 $ echo "[extensions]" >> $HGRCPATH |
26 $ echo "convert = " >> $HGRCPATH |
26 $ echo "convert = " >> $HGRCPATH |
27 $ echo "graphlog = " >> $HGRCPATH |
|
28 $ echo "[convert]" >> $HGRCPATH |
27 $ echo "[convert]" >> $HGRCPATH |
29 $ echo "cvsps.cache=0" >> $HGRCPATH |
28 $ echo "cvsps.cache=0" >> $HGRCPATH |
30 $ echo "cvsps.mergefrom=\[MERGE from (\S+)\]" >> $HGRCPATH |
29 $ echo "cvsps.mergefrom=\[MERGE from (\S+)\]" >> $HGRCPATH |
31 |
30 |
32 create cvs repository with one project |
31 create cvs repository with one project |
208 1: 'v1_1' unrelated change |
207 1: 'v1_1' unrelated change |
209 0: '' add file1 on trunk |
208 0: '' add file1 on trunk |
210 |
209 |
211 graphical log |
210 graphical log |
212 |
211 |
213 $ hg -R proj.hg glog --template="$template" |
212 $ hg -R proj.hg log -G --template="$template" |
214 o 9: '' fix file1 [MERGE from v1-1] |
213 o 9: '' fix file1 [MERGE from v1-1] |
215 | |
214 | |
216 | o 8: 'v1_1' fix file1 |
215 | o 8: 'v1_1' fix file1 |
217 | | |
216 | | |
218 | o 7: 'v1_1' add other text [MERGE from HEAD] |
217 | o 7: 'v1_1' add other text [MERGE from HEAD] |