annotate tests/test-convert-cvsnt-mergepoints.t @ 23155:25e12d496429

test-revert: removing a missing file has no effect The tests for removed_deleted and removed_removed test the same state as removed_clean and removed_untracked-clean, respectively. Drop the duplicate tests. See additional motivation in earlier patch.
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 16 Oct 2014 23:59:08 -0700
parents 7a9cbb315d84
children 96529f81e2e9
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
22046
7a9cbb315d84 tests: replace exit 80 with #require
Matt Mackall <mpm@selenic.com>
parents: 20117
diff changeset
1 #require cvs
7956
3e7611a83230 convert: added cvsnt mergepoint support
Henrik Stuart <henrik.stuart@edlund.dk>
parents:
diff changeset
2
12523
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
3 $ filterpath()
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
4 > {
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
5 > eval "$@" | sed "s:$CVSROOT:*REPO*:g"
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
6 > }
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
7 $ cvscall()
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
8 > {
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
9 > cvs -f "$@"
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
10 > }
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
11
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
12 output of 'cvs ci' varies unpredictably, so discard most of it
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
13 -- just keep the part that matters
7956
3e7611a83230 convert: added cvsnt mergepoint support
Henrik Stuart <henrik.stuart@edlund.dk>
parents:
diff changeset
14
12523
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
15 $ cvsci()
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
16 > {
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
17 > cvs -f ci -f "$@" > /dev/null
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
18 > }
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
19 $ hgcat()
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
20 > {
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
21 > hg --cwd src-hg cat -r tip "$1"
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
22 > }
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
23 $ echo "[extensions]" >> $HGRCPATH
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
24 $ echo "convert = " >> $HGRCPATH
8819
e93ab347c814 test-convert-cvsnt-mergepoints: ignore differences between CVS 1.11 and 1.12.
Greg Ward <greg-hg@gerg.ca>
parents: 8818
diff changeset
25
12523
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
26 create cvs repository
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
27
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
28 $ mkdir cvsmaster
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
29 $ cd cvsmaster
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
30 $ CVSROOT=`pwd`
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
31 $ export CVSROOT
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
32 $ CVS_OPTIONS=-f
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
33 $ export CVS_OPTIONS
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
34 $ cd ..
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
35 $ filterpath cvscall -Q -d "$CVSROOT" init
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
36
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
37 checkout #1: add foo.txt
7956
3e7611a83230 convert: added cvsnt mergepoint support
Henrik Stuart <henrik.stuart@edlund.dk>
parents:
diff changeset
38
12523
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
39 $ cvscall -Q checkout -d cvsworktmp .
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
40 $ cd cvsworktmp
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
41 $ mkdir foo
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
42 $ cvscall -Q add foo
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
43 $ cd foo
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
44 $ echo foo > foo.txt
17345
4f8054d3171b check-code: fix check for trailing whitespace on sh command lines
Mads Kiilerich <mads@kiilerich.com>
parents: 16972
diff changeset
45 $ cvscall -Q add foo.txt
12523
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
46 $ cvsci -m "add foo.txt" foo.txt
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
47 $ cd ../..
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
48 $ rm -rf cvsworktmp
8819
e93ab347c814 test-convert-cvsnt-mergepoints: ignore differences between CVS 1.11 and 1.12.
Greg Ward <greg-hg@gerg.ca>
parents: 8818
diff changeset
49
12523
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
50 checkout #2: create MYBRANCH1 and modify foo.txt on it
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
51
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
52 $ cvscall -Q checkout -d cvswork foo
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
53 $ cd cvswork
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
54 $ cvscall -q rtag -b -R MYBRANCH1 foo
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
55 $ cvscall -Q update -P -r MYBRANCH1
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
56 $ echo bar > foo.txt
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
57 $ cvsci -m "bar" foo.txt
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
58 $ echo baz > foo.txt
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
59 $ cvsci -m "baz" foo.txt
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
60
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
61 create MYBRANCH1_2 and modify foo.txt some more
7956
3e7611a83230 convert: added cvsnt mergepoint support
Henrik Stuart <henrik.stuart@edlund.dk>
parents:
diff changeset
62
12523
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
63 $ cvscall -q rtag -b -R -r MYBRANCH1 MYBRANCH1_2 foo
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
64 $ cvscall -Q update -P -r MYBRANCH1_2
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
65 $ echo bazzie > foo.txt
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
66 $ cvsci -m "bazzie" foo.txt
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
67
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
68 create MYBRANCH1_1 and modify foo.txt yet again
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
69
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
70 $ cvscall -q rtag -b -R MYBRANCH1_1 foo
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
71 $ cvscall -Q update -P -r MYBRANCH1_1
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
72 $ echo quux > foo.txt
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
73 $ cvsci -m "quux" foo.txt
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
74
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
75 merge MYBRANCH1 to MYBRANCH1_1
7956
3e7611a83230 convert: added cvsnt mergepoint support
Henrik Stuart <henrik.stuart@edlund.dk>
parents:
diff changeset
76
12523
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
77 $ filterpath cvscall -Q update -P -jMYBRANCH1
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
78 rcsmerge: warning: conflicts during merge
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
79 RCS file: *REPO*/foo/foo.txt,v
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
80 retrieving revision 1.1
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
81 retrieving revision 1.1.2.2
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
82 Merging differences between 1.1 and 1.1.2.2 into foo.txt
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
83
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
84 carefully placed sleep to dodge cvs bug (optimization?) where it
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
85 sometimes ignores a "commit" command if it comes too fast (the -f
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
86 option in cvsci seems to work for all the other commits in this
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
87 script)
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
88
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
89 $ sleep 1
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
90 $ echo xyzzy > foo.txt
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
91 $ cvsci -m "merge1+clobber" foo.txt
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
92
16972
5efe9c6a34fe tests: add some missing #if's / hghave requirements
Mads Kiilerich <mads@kiilerich.com>
parents: 16913
diff changeset
93 #if unix-permissions
5efe9c6a34fe tests: add some missing #if's / hghave requirements
Mads Kiilerich <mads@kiilerich.com>
parents: 16913
diff changeset
94
12523
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
95 return to trunk and merge MYBRANCH1_2
7956
3e7611a83230 convert: added cvsnt mergepoint support
Henrik Stuart <henrik.stuart@edlund.dk>
parents:
diff changeset
96
12523
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
97 $ cvscall -Q update -P -A
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
98 $ filterpath cvscall -Q update -P -jMYBRANCH1_2
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
99 RCS file: *REPO*/foo/foo.txt,v
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
100 retrieving revision 1.1
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
101 retrieving revision 1.1.2.2.2.1
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
102 Merging differences between 1.1 and 1.1.2.2.2.1 into foo.txt
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
103 $ cvsci -m "merge2" foo.txt
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
104 $ REALCVS=`which cvs`
16350
4f795f5fbb0b tests: make tests work if directory contains special characters
Thomas Arendsen Hein <thomas@intevation.de>
parents: 12523
diff changeset
105 $ 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
12523
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
106 $ chmod +x ../cvs
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
107 $ PATH=..:${PATH} hg debugcvsps --parents foo
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
108 collecting CVS rlog
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
109 7 log entries
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
110 creating changesets
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
111 7 changeset entries
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
112 ---------------------
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
113 PatchSet 1
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
114 Date: * (glob)
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
115 Author: user
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
116 Branch: HEAD
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
117 Tag: (none)
18375
cfbd33020066 convert: report cvsps branchpoints sorted
Mads Kiilerich <mads@kiilerich.com>
parents: 17345
diff changeset
118 Branchpoints: MYBRANCH1, MYBRANCH1_1
12523
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
119 Log:
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
120 foo.txt
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
121
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
122 Members:
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
123 foo.txt:INITIAL->1.1
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
124
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
125 ---------------------
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
126 PatchSet 2
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
127 Date: * (glob)
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
128 Author: user
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
129 Branch: MYBRANCH1
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
130 Tag: (none)
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
131 Parent: 1
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
132 Log:
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
133 bar
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
134
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
135 Members:
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
136 foo.txt:1.1->1.1.2.1
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
137
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
138 ---------------------
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
139 PatchSet 3
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
140 Date: * (glob)
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
141 Author: user
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
142 Branch: MYBRANCH1
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
143 Tag: (none)
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
144 Branchpoints: MYBRANCH1_2
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
145 Parent: 2
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
146 Log:
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
147 baz
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
148
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
149 Members:
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
150 foo.txt:1.1.2.1->1.1.2.2
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
151
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
152 ---------------------
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
153 PatchSet 4
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
154 Date: * (glob)
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
155 Author: user
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
156 Branch: MYBRANCH1_1
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
157 Tag: (none)
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
158 Parent: 1
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
159 Log:
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
160 quux
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
161
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
162 Members:
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
163 foo.txt:1.1->1.1.4.1
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
164
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
165 ---------------------
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
166 PatchSet 5
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
167 Date: * (glob)
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
168 Author: user
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
169 Branch: MYBRANCH1_2
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
170 Tag: (none)
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
171 Parent: 3
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
172 Log:
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
173 bazzie
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
174
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
175 Members:
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
176 foo.txt:1.1.2.2->1.1.2.2.2.1
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
177
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
178 ---------------------
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
179 PatchSet 6
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
180 Date: * (glob)
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
181 Author: user
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
182 Branch: HEAD
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
183 Tag: (none)
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
184 Parents: 1,5
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
185 Log:
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
186 merge
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
187
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
188 Members:
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
189 foo.txt:1.1->1.2
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
190
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
191 ---------------------
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
192 PatchSet 7
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
193 Date: * (glob)
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
194 Author: user
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
195 Branch: MYBRANCH1_1
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
196 Tag: (none)
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
197 Parents: 4,3
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
198 Log:
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
199 merge
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
200
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
201 Members:
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
202 foo.txt:1.1.4.1->1.1.4.2
a164a9cff771 tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents: 9543
diff changeset
203
16972
5efe9c6a34fe tests: add some missing #if's / hghave requirements
Mads Kiilerich <mads@kiilerich.com>
parents: 16913
diff changeset
204 #endif
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 16350
diff changeset
205
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 16350
diff changeset
206 $ cd ..