Mercurial > hg
annotate tests/test-transplant.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 | 7439ea4146f8 |
children | 3cbb3c57a50e b247123d71f6 |
rev | line source |
---|---|
11800
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
1 $ cat <<EOF >> $HGRCPATH |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
2 > [extensions] |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
3 > transplant= |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
4 > EOF |
3714 | 5 |
11800
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
6 $ hg init t |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
7 $ cd t |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
8 $ echo r1 > r1 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
9 $ hg ci -Amr1 -d'0 0' |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
10 adding r1 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
11 $ echo r2 > r2 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
12 $ hg ci -Amr2 -d'1 0' |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
13 adding r2 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
14 $ hg up 0 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
15 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
3714 | 16 |
11800
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
17 $ echo b1 > b1 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
18 $ hg ci -Amb1 -d '0 0' |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
19 adding b1 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
20 created new head |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
21 $ echo b2 > b2 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
22 $ hg ci -Amb2 -d '1 0' |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
23 adding b2 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
24 $ echo b3 > b3 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
25 $ hg ci -Amb3 -d '2 0' |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
26 adding b3 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
27 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
28 $ hg log --template '{rev} {parents} {desc}\n' |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
29 4 b3 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
30 3 b2 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
31 2 0:17ab29e464c6 b1 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
32 1 r2 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
33 0 r1 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
34 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
35 $ hg clone . ../rebase |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
36 updating to branch default |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
37 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
38 $ cd ../rebase |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
39 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
40 $ hg up -C 1 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
41 1 files updated, 0 files merged, 3 files removed, 0 files unresolved |
3714 | 42 |
11800
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
43 rebase b onto r1 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
44 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
45 $ hg transplant -a -b tip |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
46 applying 37a1297eb21b |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
47 37a1297eb21b transplanted to e234d668f844 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
48 applying 722f4667af76 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
49 722f4667af76 transplanted to 539f377d78df |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
50 applying a53251cdf717 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
51 a53251cdf717 transplanted to ffd6818a3975 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
52 $ hg log --template '{rev} {parents} {desc}\n' |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
53 7 b3 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
54 6 b2 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
55 5 1:d11e3596cc1a b1 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
56 4 b3 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
57 3 b2 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
58 2 0:17ab29e464c6 b1 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
59 1 r2 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
60 0 r1 |
3714 | 61 |
12811
0e284735e65b
test-transplant: test transplanted() revset
Patrick Mezard <pmezard@gmail.com>
parents:
12399
diff
changeset
|
62 test transplanted revset |
0e284735e65b
test-transplant: test transplanted() revset
Patrick Mezard <pmezard@gmail.com>
parents:
12399
diff
changeset
|
63 |
0e284735e65b
test-transplant: test transplanted() revset
Patrick Mezard <pmezard@gmail.com>
parents:
12399
diff
changeset
|
64 $ hg log -r 'transplanted()' --template '{rev} {parents} {desc}\n' |
0e284735e65b
test-transplant: test transplanted() revset
Patrick Mezard <pmezard@gmail.com>
parents:
12399
diff
changeset
|
65 5 1:d11e3596cc1a b1 |
0e284735e65b
test-transplant: test transplanted() revset
Patrick Mezard <pmezard@gmail.com>
parents:
12399
diff
changeset
|
66 6 b2 |
0e284735e65b
test-transplant: test transplanted() revset
Patrick Mezard <pmezard@gmail.com>
parents:
12399
diff
changeset
|
67 7 b3 |
0e284735e65b
test-transplant: test transplanted() revset
Patrick Mezard <pmezard@gmail.com>
parents:
12399
diff
changeset
|
68 $ hg help revsets | grep transplanted |
0e284735e65b
test-transplant: test transplanted() revset
Patrick Mezard <pmezard@gmail.com>
parents:
12399
diff
changeset
|
69 "transplanted(set)" |
0e284735e65b
test-transplant: test transplanted() revset
Patrick Mezard <pmezard@gmail.com>
parents:
12399
diff
changeset
|
70 |
11800
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
71 $ hg clone ../t ../prune |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
72 updating to branch default |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
73 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
74 $ cd ../prune |
3714 | 75 |
11800
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
76 $ hg up -C 1 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
77 1 files updated, 0 files merged, 3 files removed, 0 files unresolved |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
78 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
79 rebase b onto r1, skipping b2 |
3714 | 80 |
11800
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
81 $ hg transplant -a -b tip -p 3 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
82 applying 37a1297eb21b |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
83 37a1297eb21b transplanted to e234d668f844 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
84 applying a53251cdf717 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
85 a53251cdf717 transplanted to 7275fda4d04f |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
86 $ hg log --template '{rev} {parents} {desc}\n' |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
87 6 b3 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
88 5 1:d11e3596cc1a b1 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
89 4 b3 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
90 3 b2 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
91 2 0:17ab29e464c6 b1 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
92 1 r2 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
93 0 r1 |
3714 | 94 |
11800
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
95 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
96 remote transplant |
3714 | 97 |
11800
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
98 $ hg clone -r 1 ../t ../remote |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
99 adding changesets |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
100 adding manifests |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
101 adding file changes |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
102 added 2 changesets with 2 changes to 2 files |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
103 updating to branch default |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
104 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
105 $ cd ../remote |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
106 $ hg transplant --log -s ../t 2 4 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
107 searching for changes |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
108 applying 37a1297eb21b |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
109 37a1297eb21b transplanted to c19cf0ccb069 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
110 applying a53251cdf717 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
111 a53251cdf717 transplanted to f7fe5bf98525 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
112 $ hg log --template '{rev} {parents} {desc}\n' |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
113 3 b3 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
114 (transplanted from a53251cdf717679d1907b289f991534be05c997a) |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
115 2 b1 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
116 (transplanted from 37a1297eb21b3ef5c5d2ffac22121a0988ed9f21) |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
117 1 r2 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
118 0 r1 |
3714 | 119 |
11800
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
120 skip previous transplants |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
121 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
122 $ hg transplant -s ../t -a -b 4 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
123 searching for changes |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
124 applying 722f4667af76 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
125 722f4667af76 transplanted to 47156cd86c0b |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
126 $ hg log --template '{rev} {parents} {desc}\n' |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
127 4 b2 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
128 3 b3 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
129 (transplanted from a53251cdf717679d1907b289f991534be05c997a) |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
130 2 b1 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
131 (transplanted from 37a1297eb21b3ef5c5d2ffac22121a0988ed9f21) |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
132 1 r2 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
133 0 r1 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
134 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
135 skip local changes transplanted to the source |
3714 | 136 |
11800
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
137 $ echo b4 > b4 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
138 $ hg ci -Amb4 -d '3 0' |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
139 adding b4 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
140 $ hg clone ../t ../pullback |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
141 updating to branch default |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
142 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
143 $ cd ../pullback |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
144 $ hg transplant -s ../remote -a -b tip |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
145 searching for changes |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
146 applying 4333daefcb15 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
147 4333daefcb15 transplanted to 5f42c04e07cc |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
148 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
149 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
150 remote transplant with pull |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
151 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
152 $ hg -R ../t serve -p $HGPORT -d --pid-file=../t.pid |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
153 $ cat ../t.pid >> $DAEMON_PIDS |
3714 | 154 |
11800
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
155 $ hg clone -r 0 ../t ../rp |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
156 adding changesets |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
157 adding manifests |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
158 adding file changes |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
159 added 1 changesets with 1 changes to 1 files |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
160 updating to branch default |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
161 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
162 $ cd ../rp |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
163 $ hg transplant -s http://localhost:$HGPORT/ 2 4 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
164 searching for changes |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
165 searching for changes |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
166 adding changesets |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
167 adding manifests |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
168 adding file changes |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
169 added 1 changesets with 1 changes to 1 files |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
170 applying a53251cdf717 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
171 a53251cdf717 transplanted to 8d9279348abb |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
172 $ hg log --template '{rev} {parents} {desc}\n' |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
173 2 b3 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
174 1 b1 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
175 0 r1 |
3724
ea523d6f5f1a
transplant: fix --continue; add --continue test
Brendan Cully <brendan@kublai.com>
parents:
3714
diff
changeset
|
176 |
11800
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
177 transplant --continue |
4036
ebf1a05f6479
Make test-transplant test pull case
Brendan Cully <brendan@kublai.com>
parents:
4034
diff
changeset
|
178 |
11800
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
179 $ hg init ../tc |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
180 $ cd ../tc |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
181 $ cat <<EOF > foo |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
182 > foo |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
183 > bar |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
184 > baz |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
185 > EOF |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
186 $ echo toremove > toremove |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
187 $ hg ci -Amfoo |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
188 adding foo |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
189 adding toremove |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
190 $ cat <<EOF > foo |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
191 > foo2 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
192 > bar2 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
193 > baz2 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
194 > EOF |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
195 $ rm toremove |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
196 $ echo added > added |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
197 $ hg ci -Amfoo2 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
198 adding added |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
199 removing toremove |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
200 $ echo bar > bar |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
201 $ hg ci -Ambar |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
202 adding bar |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
203 $ echo bar2 >> bar |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
204 $ hg ci -mbar2 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
205 $ hg up 0 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
206 2 files updated, 0 files merged, 2 files removed, 0 files unresolved |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
207 $ echo foobar > foo |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
208 $ hg ci -mfoobar |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
209 created new head |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
210 $ hg transplant 1:3 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
211 applying a1e30dd1b8e7 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
212 patching file foo |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
213 Hunk #1 FAILED at 0 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
214 1 out of 1 hunks FAILED -- saving rejects to file foo.rej |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
215 patch failed to apply |
12070 | 216 abort: fix up the merge and run hg transplant --continue |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
217 [255] |
11800
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
218 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
219 transplant -c shouldn't use an old changeset |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
220 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
221 $ hg up -C |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
222 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
223 $ rm added |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
224 $ hg transplant 1 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
225 applying a1e30dd1b8e7 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
226 patching file foo |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
227 Hunk #1 FAILED at 0 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
228 1 out of 1 hunks FAILED -- saving rejects to file foo.rej |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
229 patch failed to apply |
12070 | 230 abort: fix up the merge and run hg transplant --continue |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
231 [255] |
11800
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
232 $ hg transplant --continue |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
233 a1e30dd1b8e7 transplanted as f1563cf27039 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
234 $ hg transplant 1:3 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
235 skipping already applied revision 1:a1e30dd1b8e7 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
236 applying 1739ac5f6139 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
237 1739ac5f6139 transplanted to d649c221319f |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
238 applying 0282d5fbbe02 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
239 0282d5fbbe02 transplanted to 77418277ccb3 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
240 $ hg locate |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
241 added |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
242 bar |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
243 foo |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
244 $ cd .. |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
245 |
12399
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
12376
diff
changeset
|
246 Issue1111: Test transplant --merge |
11800
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
247 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
248 $ hg init t1111 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
249 $ cd t1111 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
250 $ echo a > a |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
251 $ hg ci -Am adda |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
252 adding a |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
253 $ echo b >> a |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
254 $ hg ci -m appendb |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
255 $ echo c >> a |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
256 $ hg ci -m appendc |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
257 $ hg up -C 0 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
258 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
259 $ echo d >> a |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
260 $ hg ci -m appendd |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
261 created new head |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
262 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
263 tranplant |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
264 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
265 $ hg transplant -m 1 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
266 applying 42dc4432fd35 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
267 1:42dc4432fd35 merged at a9f4acbac129 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
268 $ cd .. |
6639
6334569c8caa
localrepo: fix partial merge test (issue 1111)
Patrick Mezard <pmezard@gmail.com>
parents:
5384
diff
changeset
|
269 |
11800
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
270 test transplant into empty repository |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
271 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
272 $ hg init empty |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
273 $ cd empty |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
274 $ hg transplant -s ../t -b tip -a |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
275 adding changesets |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
276 adding manifests |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
277 adding file changes |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
278 added 4 changesets with 4 changes to 4 files |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
279 $ cd .. |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
280 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
281 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
282 test filter |
8173
d3fb413667e5
transplant: remove the restriction that the destination be nonempty.
Jacob Lee <artdent@gmail.com>
parents:
8167
diff
changeset
|
283 |
11800
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
284 $ hg init filter |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
285 $ cd filter |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
286 $ cat <<'EOF' >test-filter |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
287 > #!/bin/sh |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
288 > sed 's/r1/r2/' $1 > $1.new |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
289 > mv $1.new $1 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
290 > EOF |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
291 $ chmod +x test-filter |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
292 $ hg transplant -s ../t -b tip -a --filter ./test-filter |
12376
97ffc68f71d3
tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents:
12375
diff
changeset
|
293 filtering * (glob) |
11800
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
294 applying 17ab29e464c6 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
295 17ab29e464c6 transplanted to e9ffc54ea104 |
12376
97ffc68f71d3
tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents:
12375
diff
changeset
|
296 filtering * (glob) |
11800
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
297 applying 37a1297eb21b |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
298 37a1297eb21b transplanted to 348b36d0b6a5 |
12376
97ffc68f71d3
tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents:
12375
diff
changeset
|
299 filtering * (glob) |
11800
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
300 applying 722f4667af76 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
301 722f4667af76 transplanted to 0aa6979afb95 |
12376
97ffc68f71d3
tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents:
12375
diff
changeset
|
302 filtering * (glob) |
11800
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
303 applying a53251cdf717 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
304 a53251cdf717 transplanted to 14f8512272b5 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
305 $ hg log --template '{rev} {parents} {desc}\n' |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
306 3 b3 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
307 2 b2 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
308 1 b1 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
309 0 r2 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
310 $ cd .. |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
311 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
312 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
313 test filter with failed patch |
8173
d3fb413667e5
transplant: remove the restriction that the destination be nonempty.
Jacob Lee <artdent@gmail.com>
parents:
8167
diff
changeset
|
314 |
11800
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
315 $ cd filter |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
316 $ hg up 0 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
317 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
318 $ echo foo > b1 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12070
diff
changeset
|
319 $ hg ci -Am foo |
11800
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
320 adding b1 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
321 adding test-filter |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
322 created new head |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
323 $ hg transplant 1 --filter ./test-filter |
12376
97ffc68f71d3
tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents:
12375
diff
changeset
|
324 filtering * (glob) |
11800
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
325 applying 348b36d0b6a5 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
326 file b1 already exists |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
327 1 out of 1 hunks FAILED -- saving rejects to file b1.rej |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
328 patch failed to apply |
12070 | 329 abort: fix up the merge and run hg transplant --continue |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
330 [255] |
11800
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
331 $ cd .. |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
332 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
333 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
334 test with a win32ext like setup (differing EOLs) |
8811
8b35b08724eb
Make mq, record and transplant honor patch.eol
Patrick Mezard <pmezard@gmail.com>
parents:
8518
diff
changeset
|
335 |
11800
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
336 $ hg init twin1 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
337 $ cd twin1 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
338 $ echo a > a |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
339 $ echo b > b |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
340 $ echo b >> b |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
341 $ hg ci -Am t |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
342 adding a |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
343 adding b |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
344 $ echo a > b |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
345 $ echo b >> b |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
346 $ hg ci -m changeb |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
347 $ cd .. |
9995
eba6c8687fd2
transplant: fix small bug when a patch fails while using --filter
Sune Foldager <cryo@cyanite.org>
parents:
8811
diff
changeset
|
348 |
11800
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
349 $ hg init twin2 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
350 $ cd twin2 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
351 $ echo '[patch]' >> .hg/hgrc |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
352 $ echo 'eol = crlf' >> .hg/hgrc |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
353 $ python -c "file('b', 'wb').write('b\r\nb\r\n')" |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
354 $ hg ci -m addb |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
355 nothing changed |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12156
diff
changeset
|
356 [1] |
11800
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
357 $ hg transplant -s ../twin1 tip |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
358 applying 2e849d776c17 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
359 2e849d776c17 transplanted to 589cea8ba85b |
12943
7439ea4146f8
tests: use (esc) instead of other kinds of string escaping
Mads Kiilerich <mads@kiilerich.com>
parents:
12847
diff
changeset
|
360 $ cat b |
7439ea4146f8
tests: use (esc) instead of other kinds of string escaping
Mads Kiilerich <mads@kiilerich.com>
parents:
12847
diff
changeset
|
361 a\r (esc) |
7439ea4146f8
tests: use (esc) instead of other kinds of string escaping
Mads Kiilerich <mads@kiilerich.com>
parents:
12847
diff
changeset
|
362 b\r (esc) |
11800
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
363 $ cd .. |