Mercurial > hg
annotate tests/test-convert-cvsnt-mergepoints.t @ 13290:82133e91ce7d
record: turn consumefile() into a pure function
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Sun, 23 Jan 2011 12:44:05 +0100 |
parents | a164a9cff771 |
children | 4f795f5fbb0b |
rev | line source |
---|---|
7956
3e7611a83230
convert: added cvsnt mergepoint support
Henrik Stuart <henrik.stuart@edlund.dk>
parents:
diff
changeset
|
1 |
12523
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
2 $ "$TESTDIR/hghave" cvs || exit 80 |
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 |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
25 $ echo "graphlog = " >> $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
|
26 |
12523
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
27 create cvs repository |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
28 |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
29 $ mkdir cvsmaster |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
30 $ cd cvsmaster |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
31 $ CVSROOT=`pwd` |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
32 $ export CVSROOT |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
33 $ CVS_OPTIONS=-f |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
34 $ export CVS_OPTIONS |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
35 $ cd .. |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
36 $ filterpath cvscall -Q -d "$CVSROOT" init |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
37 |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
38 checkout #1: add foo.txt |
7956
3e7611a83230
convert: added cvsnt mergepoint support
Henrik Stuart <henrik.stuart@edlund.dk>
parents:
diff
changeset
|
39 |
12523
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
40 $ cvscall -Q checkout -d cvsworktmp . |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
41 $ cd cvsworktmp |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
42 $ mkdir foo |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
43 $ cvscall -Q add foo |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
44 $ cd foo |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
45 $ echo foo > foo.txt |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
46 $ cvscall -Q add foo.txt |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
47 $ cvsci -m "add foo.txt" foo.txt |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
48 $ cd ../.. |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
49 $ 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
|
50 |
12523
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
51 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
|
52 |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
53 $ cvscall -Q checkout -d cvswork foo |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
54 $ cd cvswork |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
55 $ cvscall -q rtag -b -R MYBRANCH1 foo |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
56 $ cvscall -Q update -P -r MYBRANCH1 |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
57 $ echo bar > foo.txt |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
58 $ cvsci -m "bar" foo.txt |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
59 $ echo baz > foo.txt |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
60 $ cvsci -m "baz" foo.txt |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
61 |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
62 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
|
63 |
12523
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
64 $ 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
|
65 $ cvscall -Q update -P -r MYBRANCH1_2 |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
66 $ echo bazzie > foo.txt |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
67 $ cvsci -m "bazzie" foo.txt |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
68 |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
69 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
|
70 |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
71 $ cvscall -q rtag -b -R MYBRANCH1_1 foo |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
72 $ cvscall -Q update -P -r MYBRANCH1_1 |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
73 $ echo quux > foo.txt |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
74 $ cvsci -m "quux" foo.txt |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
75 |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
76 merge MYBRANCH1 to MYBRANCH1_1 |
7956
3e7611a83230
convert: added cvsnt mergepoint support
Henrik Stuart <henrik.stuart@edlund.dk>
parents:
diff
changeset
|
77 |
12523
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
78 $ filterpath cvscall -Q update -P -jMYBRANCH1 |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
79 rcsmerge: warning: conflicts during merge |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
80 RCS file: *REPO*/foo/foo.txt,v |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
81 retrieving revision 1.1 |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
82 retrieving revision 1.1.2.2 |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
83 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
|
84 |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
85 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
|
86 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
|
87 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
|
88 script) |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
89 |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
90 $ sleep 1 |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
91 $ echo xyzzy > foo.txt |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
92 $ cvsci -m "merge1+clobber" foo.txt |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
93 |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
94 return to trunk and merge MYBRANCH1_2 |
7956
3e7611a83230
convert: added cvsnt mergepoint support
Henrik Stuart <henrik.stuart@edlund.dk>
parents:
diff
changeset
|
95 |
12523
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
96 $ cvscall -Q update -P -A |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
97 $ filterpath cvscall -Q update -P -jMYBRANCH1_2 |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
98 RCS file: *REPO*/foo/foo.txt,v |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
99 retrieving revision 1.1 |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
100 retrieving revision 1.1.2.2.2.1 |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
101 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
|
102 $ cvsci -m "merge2" foo.txt |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
103 $ REALCVS=`which cvs` |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
104 $ 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 |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
105 $ chmod +x ../cvs |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
106 $ PATH=..:${PATH} hg debugcvsps --parents foo |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
107 collecting CVS rlog |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
108 7 log entries |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
109 creating changesets |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
110 7 changeset entries |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
111 --------------------- |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
112 PatchSet 1 |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
113 Date: * (glob) |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
114 Author: user |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
115 Branch: HEAD |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
116 Tag: (none) |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
117 Branchpoints: MYBRANCH1_1, MYBRANCH1 |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
118 Log: |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
119 foo.txt |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
120 |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
121 Members: |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
122 foo.txt:INITIAL->1.1 |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
123 |
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 PatchSet 2 |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
126 Date: * (glob) |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
127 Author: user |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
128 Branch: MYBRANCH1 |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
129 Tag: (none) |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
130 Parent: 1 |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
131 Log: |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
132 bar |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
133 |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
134 Members: |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
135 foo.txt:1.1->1.1.2.1 |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
136 |
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 PatchSet 3 |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
139 Date: * (glob) |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
140 Author: user |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
141 Branch: MYBRANCH1 |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
142 Tag: (none) |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
143 Branchpoints: MYBRANCH1_2 |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
144 Parent: 2 |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
145 Log: |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
146 baz |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
147 |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
148 Members: |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
149 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
|
150 |
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 PatchSet 4 |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
153 Date: * (glob) |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
154 Author: user |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
155 Branch: MYBRANCH1_1 |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
156 Tag: (none) |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
157 Parent: 1 |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
158 Log: |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
159 quux |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
160 |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
161 Members: |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
162 foo.txt:1.1->1.1.4.1 |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
163 |
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 PatchSet 5 |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
166 Date: * (glob) |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
167 Author: user |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
168 Branch: MYBRANCH1_2 |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
169 Tag: (none) |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
170 Parent: 3 |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
171 Log: |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
172 bazzie |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
173 |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
174 Members: |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
175 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
|
176 |
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 PatchSet 6 |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
179 Date: * (glob) |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
180 Author: user |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
181 Branch: HEAD |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
182 Tag: (none) |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
183 Parents: 1,5 |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
184 Log: |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
185 merge |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
186 |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
187 Members: |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
188 foo.txt:1.1->1.2 |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
189 |
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 PatchSet 7 |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
192 Date: * (glob) |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
193 Author: user |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
194 Branch: MYBRANCH1_1 |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
195 Tag: (none) |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
196 Parents: 4,3 |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
197 Log: |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
198 merge |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
199 |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
200 Members: |
a164a9cff771
tests: unify test-convert-cvsnt-mergepoints
Matt Mackall <mpm@selenic.com>
parents:
9543
diff
changeset
|
201 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
|
202 |