Mercurial > hg

comparison tests/test-convert-cvs-detectmerge @ 8171:4e5bd9b97bb3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cvsps: fix crash when log message refers to non-existent branch (issue1615).
author Greg Ward <greg-hg@gerg.ca>
date Sun, 19 Apr 2009 13:12:20 -0400
parents 6c4fdde87f90
children 1f0f01bc86a5
comparison
equal deleted inserted replaced
8170:6c4fdde87f90 8171:4e5bd9b97bb3
29 eval "$@" | sed "s:$CVSROOT:*REPO*:g" 29 eval "$@" | sed "s:$CVSROOT:*REPO*:g"
30 } 30 }
31 31
32 echo "[extensions]" >> $HGRCPATH 32 echo "[extensions]" >> $HGRCPATH
33 echo "convert = " >> $HGRCPATH 33 echo "convert = " >> $HGRCPATH
34 echo "graphlog = " >> $HGRCPATH
34 echo "[convert]" >> $HGRCPATH 35 echo "[convert]" >> $HGRCPATH
35 echo "cvsps=builtin" >> $HGRCPATH 36 echo "cvsps=builtin" >> $HGRCPATH
37 echo "cvsps.cache=0" >> $HGRCPATH
36 echo "cvsps.mergefrom=\[MERGE from (\S+)\]" >> $HGRCPATH 38 echo "cvsps.mergefrom=\[MERGE from (\S+)\]" >> $HGRCPATH
37 39
38 echo % create cvs repository with one project 40 echo % create cvs repository with one project
39 mkdir cvsrepo 41 mkdir cvsrepo
40 42
88 cvscall -Q update -rv1_1 90 cvscall -Q update -rv1_1
89 filterpath cvscall -Q update -j1.2 -j1.3 file1 91 filterpath cvscall -Q update -j1.2 -j1.3 file1
90 cvsci -m"add other text [MERGE from HEAD]" file1 92 cvsci -m"add other text [MERGE from HEAD]" file1
91 93
92 set -e 94 set -e
95 echo "% fix bug on v1_1, merge to trunk with error"
96 cvscall -Q update -rv1_1
97 echo "merge forward" >> file1
98 cvscall -Q tag unmerged
99 cvsci -m"fix file1"
100 cvscall -Q update -A
101 filterpath cvscall -Q update -junmerged -jv1_1
102 # note the typo in the commit log message
103 cvsci -m"fix file1 [MERGE from v1-1]"
104 cvs -Q tag -d unmerged
105
106 set -e
93 echo % convert to hg 107 echo % convert to hg
94 cd .. 108 cd ..
95 filterpath hg convert proj proj.hg 109 filterpath hg convert proj proj.hg
96 110
97 echo % complete log 111 echo % complete log
98 template="{rev}: '{branches}' {desc}\n" 112 template="{rev}: '{branches}' {desc}\n"
99 hg -R proj.hg log --template="$template" 113 hg -R proj.hg log --template="$template"
100 114
101 echo % parents of rev 3 115 echo % graphical log
102 hg -R proj.hg parents --template="$template" -r3 116 hg -R proj.hg glog --template="$template"
103 echo % parents of rev 4
104 hg -R proj.hg parents --template="$template" -r4
105 echo % parents of rev 5
106 hg -R proj.hg parents --template="$template" -r5
107 echo % parents of rev 7
108 hg -R proj.hg parents --template="$template" -r7