Show More
@@ -73,7 +73,7 b" cvscall -q up -P -jMYBRANCH1_2 | sed 's/" | |||||
73 | cvscall -q ci -m "merge" | sed 's/.*,v.*/checking in/g' |
|
73 | cvscall -q ci -m "merge" | sed 's/.*,v.*/checking in/g' | |
74 |
|
74 | |||
75 | REALCVS=`which cvs` |
|
75 | REALCVS=`which cvs` | |
76 |
echo "for x in \$*; do if [ \"\$x\" = \"rlog\" ]; then echo \"RCS file: $CVSROOT/foo/foo.txt,v\"; cat $TESTDIR/test-convert-cvs |
|
76 | echo "for x in \$*; do if [ \"\$x\" = \"rlog\" ]; then echo \"RCS file: $CVSROOT/foo/foo.txt,v\"; cat $TESTDIR/test-convert-cvsnt-mergepoints.rlog; exit 0; fi; done; $REALCVS \$*" > cvs | |
77 | chmod +x cvs |
|
77 | chmod +x cvs | |
78 | PATH=.:${PATH} hg debugcvsps --parents foo | sed -e 's/Author:.*/Author:/' -e 's/Date:.*/Date:/' |
|
78 | PATH=.:${PATH} hg debugcvsps --parents foo | sed -e 's/Author:.*/Author:/' -e 's/Date:.*/Date:/' | |
79 |
|
79 |
@@ -52,6 +52,7 b' Date:' | |||||
52 | Author: |
|
52 | Author: | |
53 | Branch: HEAD |
|
53 | Branch: HEAD | |
54 | Tag: (none) |
|
54 | Tag: (none) | |
|
55 | Branchpoints: MYBRANCH1_1, MYBRANCH1 | |||
55 | Log: |
|
56 | Log: | |
56 | foo.txt |
|
57 | foo.txt | |
57 |
|
58 | |||
@@ -77,6 +78,7 b' Date:' | |||||
77 | Author: |
|
78 | Author: | |
78 | Branch: MYBRANCH1 |
|
79 | Branch: MYBRANCH1 | |
79 | Tag: (none) |
|
80 | Tag: (none) | |
|
81 | Branchpoints: MYBRANCH1_2 | |||
80 | Parent: 2 |
|
82 | Parent: 2 | |
81 | Log: |
|
83 | Log: | |
82 | baz |
|
84 | baz |
1 | NO CONTENT: file renamed from tests/test-convert-cvs-builtincvsps-cvsnt-mergepoints.rlog to tests/test-convert-cvsnt-mergepoints.rlog |
|
NO CONTENT: file renamed from tests/test-convert-cvs-builtincvsps-cvsnt-mergepoints.rlog to tests/test-convert-cvsnt-mergepoints.rlog |
General Comments 0
You need to be logged in to leave comments.
Login now