author | Mads Kiilerich <mads@kiilerich.com> |
Thu, 05 May 2011 01:57:13 +0200 | |
changeset 14187 | 9bbaafddfa90 |
parent 13519 | 43b3b761d9d1 |
child 16165 | 60101427d618 |
permissions | -rw-r--r-- |
12148
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
1 |
|
13519
43b3b761d9d1
tests: don't overwrite HGRCPATH
Martin Geisler <mg@aragost.com>
parents:
12950
diff
changeset
|
2 |
$ cat >> $HGRCPATH <<EOF |
12148
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
3 |
> [extensions] |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
4 |
> graphlog = |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
5 |
> convert = |
12350
e7e3b0618d8d
test-convert-hg-startrev: enable convert.hg.saverev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12148
diff
changeset
|
6 |
> [convert] |
e7e3b0618d8d
test-convert-hg-startrev: enable convert.hg.saverev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12148
diff
changeset
|
7 |
> hg.saverev = yes |
12148
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
8 |
> EOF |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
9 |
|
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
10 |
$ glog() |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
11 |
> { |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
12 |
> hg -R "$1" glog --template '{rev} "{desc}" files: {files}\n' |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
13 |
> } |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
14 |
|
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
15 |
$ hg init source |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
16 |
$ cd source |
6885
6e253aa04ff7
convert: implement startrev for hg source
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
17 |
|
12148
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
18 |
$ echo a > a |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
19 |
$ echo b > b |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
20 |
$ hg ci -d '0 0' -qAm '0: add a b' |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
21 |
$ echo c > c |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
22 |
$ hg ci -d '1 0' -qAm '1: add c' |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
23 |
$ hg copy a e |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
24 |
$ echo b >> b |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
25 |
$ hg ci -d '2 0' -qAm '2: copy e from a, change b' |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
26 |
$ hg up -C 0 |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
27 |
1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
28 |
$ echo a >> a |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
29 |
$ hg ci -d '3 0' -qAm '3: change a' |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
30 |
$ hg merge |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
31 |
merging a and e to e |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
32 |
2 files updated, 1 files merged, 0 files removed, 0 files unresolved |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
33 |
(branch merge, don't forget to commit) |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
34 |
$ hg copy b d |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
35 |
$ hg ci -d '4 0' -qAm '4: merge 2 and 3, copy d from b' |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
36 |
$ echo a >> a |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
37 |
$ hg ci -d '5 0' -qAm '5: change a' |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
38 |
$ cd .. |
6885
6e253aa04ff7
convert: implement startrev for hg source
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
39 |
|
12148
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
40 |
Convert from null revision |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
41 |
|
12950
2405b4a5964a
revlog: fix descendants() if nullrev is in revs
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12350
diff
changeset
|
42 |
$ hg convert --config convert.hg.startrev=null source full |
2405b4a5964a
revlog: fix descendants() if nullrev is in revs
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12350
diff
changeset
|
43 |
initializing destination full repository |
12148
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
44 |
scanning source... |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
45 |
sorting... |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
46 |
converting... |
12950
2405b4a5964a
revlog: fix descendants() if nullrev is in revs
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12350
diff
changeset
|
47 |
5 0: add a b |
2405b4a5964a
revlog: fix descendants() if nullrev is in revs
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12350
diff
changeset
|
48 |
4 1: add c |
2405b4a5964a
revlog: fix descendants() if nullrev is in revs
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12350
diff
changeset
|
49 |
3 2: copy e from a, change b |
2405b4a5964a
revlog: fix descendants() if nullrev is in revs
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12350
diff
changeset
|
50 |
2 3: change a |
2405b4a5964a
revlog: fix descendants() if nullrev is in revs
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12350
diff
changeset
|
51 |
1 4: merge 2 and 3, copy d from b |
2405b4a5964a
revlog: fix descendants() if nullrev is in revs
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12350
diff
changeset
|
52 |
0 5: change a |
12148
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
53 |
|
12950
2405b4a5964a
revlog: fix descendants() if nullrev is in revs
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12350
diff
changeset
|
54 |
$ glog full |
2405b4a5964a
revlog: fix descendants() if nullrev is in revs
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12350
diff
changeset
|
55 |
o 5 "5: change a" files: a |
2405b4a5964a
revlog: fix descendants() if nullrev is in revs
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12350
diff
changeset
|
56 |
| |
2405b4a5964a
revlog: fix descendants() if nullrev is in revs
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12350
diff
changeset
|
57 |
o 4 "4: merge 2 and 3, copy d from b" files: d e |
2405b4a5964a
revlog: fix descendants() if nullrev is in revs
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12350
diff
changeset
|
58 |
|\ |
2405b4a5964a
revlog: fix descendants() if nullrev is in revs
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12350
diff
changeset
|
59 |
| o 3 "3: change a" files: a |
2405b4a5964a
revlog: fix descendants() if nullrev is in revs
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12350
diff
changeset
|
60 |
| | |
2405b4a5964a
revlog: fix descendants() if nullrev is in revs
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12350
diff
changeset
|
61 |
o | 2 "2: copy e from a, change b" files: b e |
2405b4a5964a
revlog: fix descendants() if nullrev is in revs
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12350
diff
changeset
|
62 |
| | |
2405b4a5964a
revlog: fix descendants() if nullrev is in revs
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12350
diff
changeset
|
63 |
o | 1 "1: add c" files: c |
2405b4a5964a
revlog: fix descendants() if nullrev is in revs
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12350
diff
changeset
|
64 |
|/ |
2405b4a5964a
revlog: fix descendants() if nullrev is in revs
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12350
diff
changeset
|
65 |
o 0 "0: add a b" files: a b |
2405b4a5964a
revlog: fix descendants() if nullrev is in revs
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12350
diff
changeset
|
66 |
|
2405b4a5964a
revlog: fix descendants() if nullrev is in revs
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12350
diff
changeset
|
67 |
$ rm -Rf full |
12148
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
68 |
|
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
69 |
Convert from zero revision |
6885
6e253aa04ff7
convert: implement startrev for hg source
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
70 |
|
12148
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
71 |
$ hg convert --config convert.hg.startrev=0 source full |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
72 |
initializing destination full repository |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
73 |
scanning source... |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
74 |
sorting... |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
75 |
converting... |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
76 |
5 0: add a b |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
77 |
4 1: add c |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
78 |
3 2: copy e from a, change b |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
79 |
2 3: change a |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
80 |
1 4: merge 2 and 3, copy d from b |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
81 |
0 5: change a |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
82 |
|
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
83 |
$ glog full |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
84 |
o 5 "5: change a" files: a |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
85 |
| |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
86 |
o 4 "4: merge 2 and 3, copy d from b" files: d e |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
87 |
|\ |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
88 |
| o 3 "3: change a" files: a |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
89 |
| | |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
90 |
o | 2 "2: copy e from a, change b" files: b e |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
91 |
| | |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
92 |
o | 1 "1: add c" files: c |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
93 |
|/ |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
94 |
o 0 "0: add a b" files: a b |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
95 |
|
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
96 |
Convert from merge parent |
6885
6e253aa04ff7
convert: implement startrev for hg source
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
97 |
|
12148
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
98 |
$ hg convert --config convert.hg.startrev=1 source conv1 |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
99 |
initializing destination conv1 repository |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
100 |
scanning source... |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
101 |
sorting... |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
102 |
converting... |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
103 |
3 1: add c |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
104 |
2 2: copy e from a, change b |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
105 |
1 4: merge 2 and 3, copy d from b |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
106 |
0 5: change a |
6885
6e253aa04ff7
convert: implement startrev for hg source
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
107 |
|
12148
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
108 |
$ glog conv1 |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
109 |
o 3 "5: change a" files: a |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
110 |
| |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
111 |
o 2 "4: merge 2 and 3, copy d from b" files: a d e |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
112 |
| |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
113 |
o 1 "2: copy e from a, change b" files: b e |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
114 |
| |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
115 |
o 0 "1: add c" files: a b c |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
116 |
|
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
117 |
$ cd conv1 |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
118 |
|
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
119 |
Check copy preservation |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
120 |
|
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
121 |
$ hg log --follow --copies e |
12350
e7e3b0618d8d
test-convert-hg-startrev: enable convert.hg.saverev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12148
diff
changeset
|
122 |
changeset: 2:79818a521a40 |
12148
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
123 |
user: test |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
124 |
date: Thu Jan 01 00:00:04 1970 +0000 |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
125 |
summary: 4: merge 2 and 3, copy d from b |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
126 |
|
12350
e7e3b0618d8d
test-convert-hg-startrev: enable convert.hg.saverev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12148
diff
changeset
|
127 |
changeset: 1:3e6201832cce |
12148
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
128 |
user: test |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
129 |
date: Thu Jan 01 00:00:02 1970 +0000 |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
130 |
summary: 2: copy e from a, change b |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
131 |
|
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
132 |
Check copy removal on missing parent |
6885
6e253aa04ff7
convert: implement startrev for hg source
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
133 |
|
12148
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
134 |
$ hg log --follow --copies d |
12350
e7e3b0618d8d
test-convert-hg-startrev: enable convert.hg.saverev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
12148
diff
changeset
|
135 |
changeset: 2:79818a521a40 |
12148
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
136 |
user: test |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
137 |
date: Thu Jan 01 00:00:04 1970 +0000 |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
138 |
summary: 4: merge 2 and 3, copy d from b |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
139 |
|
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
140 |
$ hg cat -r tip a b |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
141 |
a |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
142 |
a |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
143 |
a |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
144 |
b |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
145 |
b |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
146 |
$ hg -q verify |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
147 |
$ cd .. |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
148 |
|
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
149 |
Convert from merge |
6885
6e253aa04ff7
convert: implement startrev for hg source
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
150 |
|
12148
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
151 |
$ hg convert --config convert.hg.startrev=4 source conv4 |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
152 |
initializing destination conv4 repository |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
153 |
scanning source... |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
154 |
sorting... |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
155 |
converting... |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
156 |
1 4: merge 2 and 3, copy d from b |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
157 |
0 5: change a |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
158 |
$ glog conv4 |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
159 |
o 1 "5: change a" files: a |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
160 |
| |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
161 |
o 0 "4: merge 2 and 3, copy d from b" files: a b c d e |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
162 |
|
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
163 |
$ cd conv4 |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
164 |
$ hg up -C |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
165 |
5 files updated, 0 files merged, 0 files removed, 0 files unresolved |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
166 |
$ hg cat -r tip a b |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
167 |
a |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
168 |
a |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
169 |
a |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
170 |
b |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
171 |
b |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
172 |
$ hg -q verify |
0a0592f8e11a
tests: unify test-convert-hg-startrev.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
10119
diff
changeset
|
173 |
$ cd .. |