Mercurial > hg
annotate tests/test-transplant.t @ 17928:082c0e1ecc23
run-tests.py: remove runqueue's results parameter since it is now a global
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Thu, 08 Nov 2012 14:10:04 -0800 |
parents | bc7377160fa7 |
children | 8ab0640c3090 |
rev | line source |
---|---|
17539
bc7377160fa7
tests: enable more server tests on Windows
Patrick Mezard <patrick@mezard.eu>
parents:
17320
diff
changeset
|
1 $ "$TESTDIR/hghave" killdaemons || exit 80 |
15446
c5c9ca3719f9
tests: use 'hghave serve' to guard tests that requires serve daemon management
Mads Kiilerich <mads@kiilerich.com>
parents:
15204
diff
changeset
|
2 |
11800
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
3 $ cat <<EOF >> $HGRCPATH |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
4 > [extensions] |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
5 > transplant= |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
6 > EOF |
3714 | 7 |
11800
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
8 $ hg init t |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
9 $ cd t |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
10 $ echo r1 > r1 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
11 $ hg ci -Amr1 -d'0 0' |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
12 adding r1 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
13 $ echo r2 > r2 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
14 $ hg ci -Amr2 -d'1 0' |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
15 adding r2 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
16 $ hg up 0 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
17 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
3714 | 18 |
11800
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
19 $ echo b1 > b1 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
20 $ hg ci -Amb1 -d '0 0' |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
21 adding b1 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
22 created new head |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
23 $ echo b2 > b2 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
24 $ hg ci -Amb2 -d '1 0' |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
25 adding b2 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
26 $ echo b3 > b3 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
27 $ hg ci -Amb3 -d '2 0' |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
28 adding b3 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
29 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
30 $ hg log --template '{rev} {parents} {desc}\n' |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
31 4 b3 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
32 3 b2 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
33 2 0:17ab29e464c6 b1 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
34 1 r2 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
35 0 r1 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
36 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
37 $ hg clone . ../rebase |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
38 updating to branch default |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
39 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
|
40 $ cd ../rebase |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
41 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
42 $ hg up -C 1 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
43 1 files updated, 0 files merged, 3 files removed, 0 files unresolved |
3714 | 44 |
11800
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
45 rebase b onto r1 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
46 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
47 $ hg transplant -a -b tip |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
48 applying 37a1297eb21b |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
49 37a1297eb21b transplanted to e234d668f844 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
50 applying 722f4667af76 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
51 722f4667af76 transplanted to 539f377d78df |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
52 applying a53251cdf717 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
53 a53251cdf717 transplanted to ffd6818a3975 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
54 $ hg log --template '{rev} {parents} {desc}\n' |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
55 7 b3 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
56 6 b2 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
57 5 1:d11e3596cc1a b1 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
58 4 b3 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
59 3 b2 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
60 2 0:17ab29e464c6 b1 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
61 1 r2 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
62 0 r1 |
3714 | 63 |
12811
0e284735e65b
test-transplant: test transplanted() revset
Patrick Mezard <pmezard@gmail.com>
parents:
12399
diff
changeset
|
64 test transplanted revset |
0e284735e65b
test-transplant: test transplanted() revset
Patrick Mezard <pmezard@gmail.com>
parents:
12399
diff
changeset
|
65 |
0e284735e65b
test-transplant: test transplanted() revset
Patrick Mezard <pmezard@gmail.com>
parents:
12399
diff
changeset
|
66 $ hg log -r 'transplanted()' --template '{rev} {parents} {desc}\n' |
0e284735e65b
test-transplant: test transplanted() revset
Patrick Mezard <pmezard@gmail.com>
parents:
12399
diff
changeset
|
67 5 1:d11e3596cc1a b1 |
0e284735e65b
test-transplant: test transplanted() revset
Patrick Mezard <pmezard@gmail.com>
parents:
12399
diff
changeset
|
68 6 b2 |
0e284735e65b
test-transplant: test transplanted() revset
Patrick Mezard <pmezard@gmail.com>
parents:
12399
diff
changeset
|
69 7 b3 |
0e284735e65b
test-transplant: test transplanted() revset
Patrick Mezard <pmezard@gmail.com>
parents:
12399
diff
changeset
|
70 $ hg help revsets | grep transplanted |
14211
b00ab6890fe9
transplant: fix revset doc
Idan Kamara <idankk86@gmail.com>
parents:
14012
diff
changeset
|
71 "transplanted([set])" |
b00ab6890fe9
transplant: fix revset doc
Idan Kamara <idankk86@gmail.com>
parents:
14012
diff
changeset
|
72 Transplanted changesets in set, or all transplanted changesets. |
12811
0e284735e65b
test-transplant: test transplanted() revset
Patrick Mezard <pmezard@gmail.com>
parents:
12399
diff
changeset
|
73 |
13689
65399579da68
transplant: add "transplanted" keyword
Patrick Mezard <pmezard@gmail.com>
parents:
13579
diff
changeset
|
74 test tranplanted keyword |
65399579da68
transplant: add "transplanted" keyword
Patrick Mezard <pmezard@gmail.com>
parents:
13579
diff
changeset
|
75 |
65399579da68
transplant: add "transplanted" keyword
Patrick Mezard <pmezard@gmail.com>
parents:
13579
diff
changeset
|
76 $ hg log --template '{rev} {transplanted}\n' |
65399579da68
transplant: add "transplanted" keyword
Patrick Mezard <pmezard@gmail.com>
parents:
13579
diff
changeset
|
77 7 a53251cdf717679d1907b289f991534be05c997a |
65399579da68
transplant: add "transplanted" keyword
Patrick Mezard <pmezard@gmail.com>
parents:
13579
diff
changeset
|
78 6 722f4667af767100cb15b6a79324bf8abbfe1ef4 |
65399579da68
transplant: add "transplanted" keyword
Patrick Mezard <pmezard@gmail.com>
parents:
13579
diff
changeset
|
79 5 37a1297eb21b3ef5c5d2ffac22121a0988ed9f21 |
65399579da68
transplant: add "transplanted" keyword
Patrick Mezard <pmezard@gmail.com>
parents:
13579
diff
changeset
|
80 4 |
65399579da68
transplant: add "transplanted" keyword
Patrick Mezard <pmezard@gmail.com>
parents:
13579
diff
changeset
|
81 3 |
65399579da68
transplant: add "transplanted" keyword
Patrick Mezard <pmezard@gmail.com>
parents:
13579
diff
changeset
|
82 2 |
65399579da68
transplant: add "transplanted" keyword
Patrick Mezard <pmezard@gmail.com>
parents:
13579
diff
changeset
|
83 1 |
65399579da68
transplant: add "transplanted" keyword
Patrick Mezard <pmezard@gmail.com>
parents:
13579
diff
changeset
|
84 0 |
65399579da68
transplant: add "transplanted" keyword
Patrick Mezard <pmezard@gmail.com>
parents:
13579
diff
changeset
|
85 |
17186
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
16972
diff
changeset
|
86 test destination() revset predicate with a transplant of a transplant; new |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
16972
diff
changeset
|
87 clone so subsequent rollback isn't affected |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
16972
diff
changeset
|
88 $ hg clone -q . ../destination |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
16972
diff
changeset
|
89 $ cd ../destination |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
16972
diff
changeset
|
90 $ hg up -Cq 0 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
16972
diff
changeset
|
91 $ hg branch -q b4 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
16972
diff
changeset
|
92 $ hg ci -qm "b4" |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
16972
diff
changeset
|
93 $ hg transplant 7 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
16972
diff
changeset
|
94 applying ffd6818a3975 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
16972
diff
changeset
|
95 ffd6818a3975 transplanted to 502236fa76bb |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
16972
diff
changeset
|
96 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
16972
diff
changeset
|
97 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
16972
diff
changeset
|
98 $ hg log -r 'destination()' |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
16972
diff
changeset
|
99 changeset: 5:e234d668f844 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
16972
diff
changeset
|
100 parent: 1:d11e3596cc1a |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
16972
diff
changeset
|
101 user: test |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
16972
diff
changeset
|
102 date: Thu Jan 01 00:00:00 1970 +0000 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
16972
diff
changeset
|
103 summary: b1 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
16972
diff
changeset
|
104 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
16972
diff
changeset
|
105 changeset: 6:539f377d78df |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
16972
diff
changeset
|
106 user: test |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
16972
diff
changeset
|
107 date: Thu Jan 01 00:00:01 1970 +0000 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
16972
diff
changeset
|
108 summary: b2 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
16972
diff
changeset
|
109 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
16972
diff
changeset
|
110 changeset: 7:ffd6818a3975 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
16972
diff
changeset
|
111 user: test |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
16972
diff
changeset
|
112 date: Thu Jan 01 00:00:02 1970 +0000 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
16972
diff
changeset
|
113 summary: b3 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
16972
diff
changeset
|
114 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
16972
diff
changeset
|
115 changeset: 9:502236fa76bb |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
16972
diff
changeset
|
116 branch: b4 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
16972
diff
changeset
|
117 tag: tip |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
16972
diff
changeset
|
118 user: test |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
16972
diff
changeset
|
119 date: Thu Jan 01 00:00:02 1970 +0000 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
16972
diff
changeset
|
120 summary: b3 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
16972
diff
changeset
|
121 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
16972
diff
changeset
|
122 $ hg log -r 'destination(a53251cdf717)' |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
16972
diff
changeset
|
123 changeset: 7:ffd6818a3975 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
16972
diff
changeset
|
124 user: test |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
16972
diff
changeset
|
125 date: Thu Jan 01 00:00:02 1970 +0000 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
16972
diff
changeset
|
126 summary: b3 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
16972
diff
changeset
|
127 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
16972
diff
changeset
|
128 changeset: 9:502236fa76bb |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
16972
diff
changeset
|
129 branch: b4 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
16972
diff
changeset
|
130 tag: tip |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
16972
diff
changeset
|
131 user: test |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
16972
diff
changeset
|
132 date: Thu Jan 01 00:00:02 1970 +0000 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
16972
diff
changeset
|
133 summary: b3 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
16972
diff
changeset
|
134 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
16972
diff
changeset
|
135 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
16972
diff
changeset
|
136 test subset parameter in reverse order |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
16972
diff
changeset
|
137 $ hg log -r 'reverse(all()) and destination(a53251cdf717)' |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
16972
diff
changeset
|
138 changeset: 9:502236fa76bb |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
16972
diff
changeset
|
139 branch: b4 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
16972
diff
changeset
|
140 tag: tip |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
16972
diff
changeset
|
141 user: test |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
16972
diff
changeset
|
142 date: Thu Jan 01 00:00:02 1970 +0000 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
16972
diff
changeset
|
143 summary: b3 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
16972
diff
changeset
|
144 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
16972
diff
changeset
|
145 changeset: 7:ffd6818a3975 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
16972
diff
changeset
|
146 user: test |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
16972
diff
changeset
|
147 date: Thu Jan 01 00:00:02 1970 +0000 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
16972
diff
changeset
|
148 summary: b3 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
16972
diff
changeset
|
149 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
16972
diff
changeset
|
150 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
16972
diff
changeset
|
151 back to the original dir |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
16972
diff
changeset
|
152 $ cd ../rebase |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
16972
diff
changeset
|
153 |
15204
3ce9b1a7538b
transplant: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents:
14223
diff
changeset
|
154 rollback the transplant |
3ce9b1a7538b
transplant: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents:
14223
diff
changeset
|
155 $ hg rollback |
3ce9b1a7538b
transplant: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents:
14223
diff
changeset
|
156 repository tip rolled back to revision 4 (undo transplant) |
3ce9b1a7538b
transplant: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents:
14223
diff
changeset
|
157 working directory now based on revision 1 |
3ce9b1a7538b
transplant: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents:
14223
diff
changeset
|
158 $ hg tip -q |
3ce9b1a7538b
transplant: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents:
14223
diff
changeset
|
159 4:a53251cdf717 |
3ce9b1a7538b
transplant: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents:
14223
diff
changeset
|
160 $ hg parents -q |
3ce9b1a7538b
transplant: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents:
14223
diff
changeset
|
161 1:d11e3596cc1a |
3ce9b1a7538b
transplant: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents:
14223
diff
changeset
|
162 $ hg status |
3ce9b1a7538b
transplant: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents:
14223
diff
changeset
|
163 ? b1 |
3ce9b1a7538b
transplant: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents:
14223
diff
changeset
|
164 ? b2 |
3ce9b1a7538b
transplant: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents:
14223
diff
changeset
|
165 ? b3 |
3ce9b1a7538b
transplant: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents:
14223
diff
changeset
|
166 |
11800
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
167 $ hg clone ../t ../prune |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
168 updating to branch default |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
169 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
|
170 $ cd ../prune |
3714 | 171 |
11800
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
172 $ hg up -C 1 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
173 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
|
174 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
175 rebase b onto r1, skipping b2 |
3714 | 176 |
11800
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
177 $ hg transplant -a -b tip -p 3 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
178 applying 37a1297eb21b |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
179 37a1297eb21b transplanted to e234d668f844 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
180 applying a53251cdf717 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
181 a53251cdf717 transplanted to 7275fda4d04f |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
182 $ hg log --template '{rev} {parents} {desc}\n' |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
183 6 b3 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
184 5 1:d11e3596cc1a b1 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
185 4 b3 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
186 3 b2 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
187 2 0:17ab29e464c6 b1 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
188 1 r2 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
189 0 r1 |
3714 | 190 |
16627
38c45a99be0b
transplant: manually transplant pullable changesets with --log
Levi Bard <levi@unity3d.com>
parents:
16507
diff
changeset
|
191 test same-parent transplant with --log |
11800
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
192 |
16627
38c45a99be0b
transplant: manually transplant pullable changesets with --log
Levi Bard <levi@unity3d.com>
parents:
16507
diff
changeset
|
193 $ hg clone -r 1 ../t ../sameparent |
38c45a99be0b
transplant: manually transplant pullable changesets with --log
Levi Bard <levi@unity3d.com>
parents:
16507
diff
changeset
|
194 adding changesets |
38c45a99be0b
transplant: manually transplant pullable changesets with --log
Levi Bard <levi@unity3d.com>
parents:
16507
diff
changeset
|
195 adding manifests |
38c45a99be0b
transplant: manually transplant pullable changesets with --log
Levi Bard <levi@unity3d.com>
parents:
16507
diff
changeset
|
196 adding file changes |
38c45a99be0b
transplant: manually transplant pullable changesets with --log
Levi Bard <levi@unity3d.com>
parents:
16507
diff
changeset
|
197 added 2 changesets with 2 changes to 2 files |
38c45a99be0b
transplant: manually transplant pullable changesets with --log
Levi Bard <levi@unity3d.com>
parents:
16507
diff
changeset
|
198 updating to branch default |
38c45a99be0b
transplant: manually transplant pullable changesets with --log
Levi Bard <levi@unity3d.com>
parents:
16507
diff
changeset
|
199 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
38c45a99be0b
transplant: manually transplant pullable changesets with --log
Levi Bard <levi@unity3d.com>
parents:
16507
diff
changeset
|
200 $ cd ../sameparent |
38c45a99be0b
transplant: manually transplant pullable changesets with --log
Levi Bard <levi@unity3d.com>
parents:
16507
diff
changeset
|
201 $ hg transplant --log -s ../prune 5 |
38c45a99be0b
transplant: manually transplant pullable changesets with --log
Levi Bard <levi@unity3d.com>
parents:
16507
diff
changeset
|
202 searching for changes |
38c45a99be0b
transplant: manually transplant pullable changesets with --log
Levi Bard <levi@unity3d.com>
parents:
16507
diff
changeset
|
203 applying e234d668f844 |
38c45a99be0b
transplant: manually transplant pullable changesets with --log
Levi Bard <levi@unity3d.com>
parents:
16507
diff
changeset
|
204 e234d668f844 transplanted to e07aea8ecf9c |
38c45a99be0b
transplant: manually transplant pullable changesets with --log
Levi Bard <levi@unity3d.com>
parents:
16507
diff
changeset
|
205 $ hg log --template '{rev} {parents} {desc}\n' |
38c45a99be0b
transplant: manually transplant pullable changesets with --log
Levi Bard <levi@unity3d.com>
parents:
16507
diff
changeset
|
206 2 b1 |
38c45a99be0b
transplant: manually transplant pullable changesets with --log
Levi Bard <levi@unity3d.com>
parents:
16507
diff
changeset
|
207 (transplanted from e234d668f844e1b1a765f01db83a32c0c7bfa170) |
38c45a99be0b
transplant: manually transplant pullable changesets with --log
Levi Bard <levi@unity3d.com>
parents:
16507
diff
changeset
|
208 1 r2 |
38c45a99be0b
transplant: manually transplant pullable changesets with --log
Levi Bard <levi@unity3d.com>
parents:
16507
diff
changeset
|
209 0 r1 |
11800
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
210 remote transplant |
3714 | 211 |
11800
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
212 $ hg clone -r 1 ../t ../remote |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
213 adding changesets |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
214 adding manifests |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
215 adding file changes |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
216 added 2 changesets with 2 changes to 2 files |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
217 updating to branch default |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
218 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
|
219 $ cd ../remote |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
220 $ hg transplant --log -s ../t 2 4 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
221 searching for changes |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
222 applying 37a1297eb21b |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
223 37a1297eb21b transplanted to c19cf0ccb069 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
224 applying a53251cdf717 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
225 a53251cdf717 transplanted to f7fe5bf98525 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
226 $ hg log --template '{rev} {parents} {desc}\n' |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
227 3 b3 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
228 (transplanted from a53251cdf717679d1907b289f991534be05c997a) |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
229 2 b1 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
230 (transplanted from 37a1297eb21b3ef5c5d2ffac22121a0988ed9f21) |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
231 1 r2 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
232 0 r1 |
3714 | 233 |
11800
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
234 skip previous transplants |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
235 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
236 $ hg transplant -s ../t -a -b 4 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
237 searching for changes |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
238 applying 722f4667af76 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
239 722f4667af76 transplanted to 47156cd86c0b |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
240 $ hg log --template '{rev} {parents} {desc}\n' |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
241 4 b2 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
242 3 b3 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
243 (transplanted from a53251cdf717679d1907b289f991534be05c997a) |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
244 2 b1 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
245 (transplanted from 37a1297eb21b3ef5c5d2ffac22121a0988ed9f21) |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
246 1 r2 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
247 0 r1 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
248 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
249 skip local changes transplanted to the source |
3714 | 250 |
11800
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
251 $ echo b4 > b4 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
252 $ hg ci -Amb4 -d '3 0' |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
253 adding b4 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
254 $ hg clone ../t ../pullback |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
255 updating to branch default |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
256 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
|
257 $ cd ../pullback |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
258 $ hg transplant -s ../remote -a -b tip |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
259 searching for changes |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
260 applying 4333daefcb15 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
261 4333daefcb15 transplanted to 5f42c04e07cc |
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 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
264 remote transplant with pull |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
265 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
266 $ 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
|
267 $ cat ../t.pid >> $DAEMON_PIDS |
3714 | 268 |
11800
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
269 $ hg clone -r 0 ../t ../rp |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
270 adding changesets |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
271 adding manifests |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
272 adding file changes |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
273 added 1 changesets with 1 changes to 1 files |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
274 updating to branch default |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
275 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
|
276 $ cd ../rp |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
277 $ hg transplant -s http://localhost:$HGPORT/ 2 4 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
278 searching for changes |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
279 searching for changes |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
280 adding changesets |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
281 adding manifests |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
282 adding file changes |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
283 added 1 changesets with 1 changes to 1 files |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
284 applying a53251cdf717 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
285 a53251cdf717 transplanted to 8d9279348abb |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
286 $ hg log --template '{rev} {parents} {desc}\n' |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
287 2 b3 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
288 1 b1 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
289 0 r1 |
3724
ea523d6f5f1a
transplant: fix --continue; add --continue test
Brendan Cully <brendan@kublai.com>
parents:
3714
diff
changeset
|
290 |
11800
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
291 transplant --continue |
4036
ebf1a05f6479
Make test-transplant test pull case
Brendan Cully <brendan@kublai.com>
parents:
4034
diff
changeset
|
292 |
11800
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
293 $ hg init ../tc |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
294 $ cd ../tc |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
295 $ cat <<EOF > foo |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
296 > foo |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
297 > bar |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
298 > baz |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
299 > EOF |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
300 $ echo toremove > toremove |
16507
1f020021adfa
transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents:
16400
diff
changeset
|
301 $ echo baz > baz |
11800
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
302 $ hg ci -Amfoo |
16507
1f020021adfa
transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents:
16400
diff
changeset
|
303 adding baz |
11800
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
304 adding foo |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
305 adding toremove |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
306 $ cat <<EOF > foo |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
307 > foo2 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
308 > bar2 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
309 > baz2 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
310 > EOF |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
311 $ rm toremove |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
312 $ echo added > added |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
313 $ hg ci -Amfoo2 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
314 adding added |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
315 removing toremove |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
316 $ echo bar > bar |
16507
1f020021adfa
transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents:
16400
diff
changeset
|
317 $ cat > baz <<EOF |
1f020021adfa
transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents:
16400
diff
changeset
|
318 > before baz |
1f020021adfa
transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents:
16400
diff
changeset
|
319 > baz |
1f020021adfa
transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents:
16400
diff
changeset
|
320 > after baz |
1f020021adfa
transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents:
16400
diff
changeset
|
321 > EOF |
11800
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
322 $ hg ci -Ambar |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
323 adding bar |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
324 $ echo bar2 >> bar |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
325 $ hg ci -mbar2 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
326 $ hg up 0 |
16507
1f020021adfa
transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents:
16400
diff
changeset
|
327 3 files updated, 0 files merged, 2 files removed, 0 files unresolved |
11800
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
328 $ echo foobar > foo |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
329 $ hg ci -mfoobar |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
330 created new head |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
331 $ hg transplant 1:3 |
16507
1f020021adfa
transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents:
16400
diff
changeset
|
332 applying 46ae92138f3c |
11800
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
333 patching file foo |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
334 Hunk #1 FAILED at 0 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
335 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
|
336 patch failed to apply |
12070 | 337 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
|
338 [255] |
11800
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
339 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
340 transplant -c shouldn't use an old changeset |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
341 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
342 $ hg up -C |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
343 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
|
344 $ rm added |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
345 $ hg transplant 1 |
16507
1f020021adfa
transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents:
16400
diff
changeset
|
346 applying 46ae92138f3c |
11800
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
347 patching file foo |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
348 Hunk #1 FAILED at 0 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
349 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
|
350 patch failed to apply |
12070 | 351 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
|
352 [255] |
11800
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
353 $ hg transplant --continue |
16507
1f020021adfa
transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents:
16400
diff
changeset
|
354 46ae92138f3c transplanted as 9159dada197d |
11800
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
355 $ hg transplant 1:3 |
16507
1f020021adfa
transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents:
16400
diff
changeset
|
356 skipping already applied revision 1:46ae92138f3c |
1f020021adfa
transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents:
16400
diff
changeset
|
357 applying 9d6d6b5a8275 |
1f020021adfa
transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents:
16400
diff
changeset
|
358 9d6d6b5a8275 transplanted to 2d17a10c922f |
1f020021adfa
transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents:
16400
diff
changeset
|
359 applying 1dab759070cf |
1f020021adfa
transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents:
16400
diff
changeset
|
360 1dab759070cf transplanted to e06a69927eb0 |
11800
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
361 $ hg locate |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
362 added |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
363 bar |
16507
1f020021adfa
transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents:
16400
diff
changeset
|
364 baz |
11800
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
365 foo |
16507
1f020021adfa
transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents:
16400
diff
changeset
|
366 |
1f020021adfa
transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents:
16400
diff
changeset
|
367 test multiple revisions and --continue |
1f020021adfa
transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents:
16400
diff
changeset
|
368 |
1f020021adfa
transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents:
16400
diff
changeset
|
369 $ hg up -qC 0 |
1f020021adfa
transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents:
16400
diff
changeset
|
370 $ echo bazbaz > baz |
1f020021adfa
transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents:
16400
diff
changeset
|
371 $ hg ci -Am anotherbaz baz |
1f020021adfa
transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents:
16400
diff
changeset
|
372 created new head |
1f020021adfa
transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents:
16400
diff
changeset
|
373 $ hg transplant 1:3 |
1f020021adfa
transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents:
16400
diff
changeset
|
374 applying 46ae92138f3c |
1f020021adfa
transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents:
16400
diff
changeset
|
375 46ae92138f3c transplanted to 1024233ea0ba |
1f020021adfa
transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents:
16400
diff
changeset
|
376 applying 9d6d6b5a8275 |
1f020021adfa
transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents:
16400
diff
changeset
|
377 patching file baz |
1f020021adfa
transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents:
16400
diff
changeset
|
378 Hunk #1 FAILED at 0 |
1f020021adfa
transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents:
16400
diff
changeset
|
379 1 out of 1 hunks FAILED -- saving rejects to file baz.rej |
1f020021adfa
transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents:
16400
diff
changeset
|
380 patch failed to apply |
1f020021adfa
transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents:
16400
diff
changeset
|
381 abort: fix up the merge and run hg transplant --continue |
1f020021adfa
transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents:
16400
diff
changeset
|
382 [255] |
1f020021adfa
transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents:
16400
diff
changeset
|
383 $ echo fixed > baz |
1f020021adfa
transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents:
16400
diff
changeset
|
384 $ hg transplant --continue |
1f020021adfa
transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents:
16400
diff
changeset
|
385 9d6d6b5a8275 transplanted as d80c49962290 |
1f020021adfa
transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents:
16400
diff
changeset
|
386 applying 1dab759070cf |
1f020021adfa
transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents:
16400
diff
changeset
|
387 1dab759070cf transplanted to aa0ffe6bd5ae |
1f020021adfa
transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents:
16400
diff
changeset
|
388 |
11800
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
389 $ cd .. |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
390 |
12399
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
12376
diff
changeset
|
391 Issue1111: Test transplant --merge |
11800
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
392 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
393 $ hg init t1111 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
394 $ cd t1111 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
395 $ echo a > a |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
396 $ hg ci -Am adda |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
397 adding a |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
398 $ echo b >> a |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
399 $ hg ci -m appendb |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
400 $ echo c >> a |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
401 $ hg ci -m appendc |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
402 $ hg up -C 0 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
403 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
|
404 $ echo d >> a |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
405 $ hg ci -m appendd |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
406 created new head |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
407 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
408 tranplant |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
409 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
410 $ hg transplant -m 1 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
411 applying 42dc4432fd35 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
412 1:42dc4432fd35 merged at a9f4acbac129 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
413 $ cd .. |
6639
6334569c8caa
localrepo: fix partial merge test (issue 1111)
Patrick Mezard <pmezard@gmail.com>
parents:
5384
diff
changeset
|
414 |
11800
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
415 test transplant into empty repository |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
416 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
417 $ hg init empty |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
418 $ cd empty |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
419 $ hg transplant -s ../t -b tip -a |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
420 adding changesets |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
421 adding manifests |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
422 adding file changes |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
423 added 4 changesets with 4 changes to 4 files |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
424 $ cd .. |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
425 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
426 |
16972
5efe9c6a34fe
tests: add some missing #if's / hghave requirements
Mads Kiilerich <mads@kiilerich.com>
parents:
16912
diff
changeset
|
427 #if unix-permissions system-sh |
5efe9c6a34fe
tests: add some missing #if's / hghave requirements
Mads Kiilerich <mads@kiilerich.com>
parents:
16912
diff
changeset
|
428 |
11800
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
429 test filter |
8173
d3fb413667e5
transplant: remove the restriction that the destination be nonempty.
Jacob Lee <artdent@gmail.com>
parents:
8167
diff
changeset
|
430 |
11800
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
431 $ hg init filter |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
432 $ cd filter |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
433 $ cat <<'EOF' >test-filter |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
434 > #!/bin/sh |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
435 > sed 's/r1/r2/' $1 > $1.new |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
436 > mv $1.new $1 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
437 > EOF |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
438 $ chmod +x test-filter |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
439 $ 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
|
440 filtering * (glob) |
11800
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
441 applying 17ab29e464c6 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
442 17ab29e464c6 transplanted to e9ffc54ea104 |
12376
97ffc68f71d3
tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents:
12375
diff
changeset
|
443 filtering * (glob) |
11800
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
444 applying 37a1297eb21b |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
445 37a1297eb21b transplanted to 348b36d0b6a5 |
12376
97ffc68f71d3
tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents:
12375
diff
changeset
|
446 filtering * (glob) |
11800
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
447 applying 722f4667af76 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
448 722f4667af76 transplanted to 0aa6979afb95 |
12376
97ffc68f71d3
tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents:
12375
diff
changeset
|
449 filtering * (glob) |
11800
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
450 applying a53251cdf717 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
451 a53251cdf717 transplanted to 14f8512272b5 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
452 $ hg log --template '{rev} {parents} {desc}\n' |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
453 3 b3 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
454 2 b2 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
455 1 b1 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
456 0 r2 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
457 $ cd .. |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
458 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
459 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
460 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
|
461 |
11800
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
462 $ cd filter |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
463 $ hg up 0 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
464 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
|
465 $ echo foo > b1 |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
12070
diff
changeset
|
466 $ hg ci -Am foo |
11800
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
467 adding b1 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
468 adding test-filter |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
469 created new head |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
470 $ hg transplant 1 --filter ./test-filter |
12376
97ffc68f71d3
tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents:
12375
diff
changeset
|
471 filtering * (glob) |
11800
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
472 applying 348b36d0b6a5 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
473 file b1 already exists |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
474 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
|
475 patch failed to apply |
12070 | 476 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
|
477 [255] |
11800
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
478 $ cd .. |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
479 |
13579
3cbb3c57a50e
transplant: added 'HGREVISION' variable to the environment passed to the 'filter' command
Luke Plant <L.Plant.98@cantab.net>
parents:
12943
diff
changeset
|
480 test environment passed to filter |
3cbb3c57a50e
transplant: added 'HGREVISION' variable to the environment passed to the 'filter' command
Luke Plant <L.Plant.98@cantab.net>
parents:
12943
diff
changeset
|
481 |
3cbb3c57a50e
transplant: added 'HGREVISION' variable to the environment passed to the 'filter' command
Luke Plant <L.Plant.98@cantab.net>
parents:
12943
diff
changeset
|
482 $ hg init filter-environment |
3cbb3c57a50e
transplant: added 'HGREVISION' variable to the environment passed to the 'filter' command
Luke Plant <L.Plant.98@cantab.net>
parents:
12943
diff
changeset
|
483 $ cd filter-environment |
3cbb3c57a50e
transplant: added 'HGREVISION' variable to the environment passed to the 'filter' command
Luke Plant <L.Plant.98@cantab.net>
parents:
12943
diff
changeset
|
484 $ cat <<'EOF' >test-filter-environment |
3cbb3c57a50e
transplant: added 'HGREVISION' variable to the environment passed to the 'filter' command
Luke Plant <L.Plant.98@cantab.net>
parents:
12943
diff
changeset
|
485 > #!/bin/sh |
3cbb3c57a50e
transplant: added 'HGREVISION' variable to the environment passed to the 'filter' command
Luke Plant <L.Plant.98@cantab.net>
parents:
12943
diff
changeset
|
486 > echo "Transplant by $HGUSER" >> $1 |
3cbb3c57a50e
transplant: added 'HGREVISION' variable to the environment passed to the 'filter' command
Luke Plant <L.Plant.98@cantab.net>
parents:
12943
diff
changeset
|
487 > echo "Transplant from rev $HGREVISION" >> $1 |
3cbb3c57a50e
transplant: added 'HGREVISION' variable to the environment passed to the 'filter' command
Luke Plant <L.Plant.98@cantab.net>
parents:
12943
diff
changeset
|
488 > EOF |
3cbb3c57a50e
transplant: added 'HGREVISION' variable to the environment passed to the 'filter' command
Luke Plant <L.Plant.98@cantab.net>
parents:
12943
diff
changeset
|
489 $ chmod +x test-filter-environment |
3cbb3c57a50e
transplant: added 'HGREVISION' variable to the environment passed to the 'filter' command
Luke Plant <L.Plant.98@cantab.net>
parents:
12943
diff
changeset
|
490 $ hg transplant -s ../t --filter ./test-filter-environment 0 |
3cbb3c57a50e
transplant: added 'HGREVISION' variable to the environment passed to the 'filter' command
Luke Plant <L.Plant.98@cantab.net>
parents:
12943
diff
changeset
|
491 filtering * (glob) |
3cbb3c57a50e
transplant: added 'HGREVISION' variable to the environment passed to the 'filter' command
Luke Plant <L.Plant.98@cantab.net>
parents:
12943
diff
changeset
|
492 applying 17ab29e464c6 |
3cbb3c57a50e
transplant: added 'HGREVISION' variable to the environment passed to the 'filter' command
Luke Plant <L.Plant.98@cantab.net>
parents:
12943
diff
changeset
|
493 17ab29e464c6 transplanted to 5190e68026a0 |
3cbb3c57a50e
transplant: added 'HGREVISION' variable to the environment passed to the 'filter' command
Luke Plant <L.Plant.98@cantab.net>
parents:
12943
diff
changeset
|
494 |
3cbb3c57a50e
transplant: added 'HGREVISION' variable to the environment passed to the 'filter' command
Luke Plant <L.Plant.98@cantab.net>
parents:
12943
diff
changeset
|
495 $ hg log --template '{rev} {parents} {desc}\n' |
3cbb3c57a50e
transplant: added 'HGREVISION' variable to the environment passed to the 'filter' command
Luke Plant <L.Plant.98@cantab.net>
parents:
12943
diff
changeset
|
496 0 r1 |
3cbb3c57a50e
transplant: added 'HGREVISION' variable to the environment passed to the 'filter' command
Luke Plant <L.Plant.98@cantab.net>
parents:
12943
diff
changeset
|
497 Transplant by test |
3cbb3c57a50e
transplant: added 'HGREVISION' variable to the environment passed to the 'filter' command
Luke Plant <L.Plant.98@cantab.net>
parents:
12943
diff
changeset
|
498 Transplant from rev 17ab29e464c6ca53e329470efe2a9918ac617a6f |
3cbb3c57a50e
transplant: added 'HGREVISION' variable to the environment passed to the 'filter' command
Luke Plant <L.Plant.98@cantab.net>
parents:
12943
diff
changeset
|
499 $ cd .. |
3cbb3c57a50e
transplant: added 'HGREVISION' variable to the environment passed to the 'filter' command
Luke Plant <L.Plant.98@cantab.net>
parents:
12943
diff
changeset
|
500 |
13789
7e5031180c0f
transplant: fix crash if filter script munges log file
Luke Plant <L.Plant.98@cantab.net>
parents:
13689
diff
changeset
|
501 test transplant with filter handles invalid changelog |
7e5031180c0f
transplant: fix crash if filter script munges log file
Luke Plant <L.Plant.98@cantab.net>
parents:
13689
diff
changeset
|
502 |
7e5031180c0f
transplant: fix crash if filter script munges log file
Luke Plant <L.Plant.98@cantab.net>
parents:
13689
diff
changeset
|
503 $ hg init filter-invalid-log |
7e5031180c0f
transplant: fix crash if filter script munges log file
Luke Plant <L.Plant.98@cantab.net>
parents:
13689
diff
changeset
|
504 $ cd filter-invalid-log |
7e5031180c0f
transplant: fix crash if filter script munges log file
Luke Plant <L.Plant.98@cantab.net>
parents:
13689
diff
changeset
|
505 $ cat <<'EOF' >test-filter-invalid-log |
7e5031180c0f
transplant: fix crash if filter script munges log file
Luke Plant <L.Plant.98@cantab.net>
parents:
13689
diff
changeset
|
506 > #!/bin/sh |
7e5031180c0f
transplant: fix crash if filter script munges log file
Luke Plant <L.Plant.98@cantab.net>
parents:
13689
diff
changeset
|
507 > echo "" > $1 |
7e5031180c0f
transplant: fix crash if filter script munges log file
Luke Plant <L.Plant.98@cantab.net>
parents:
13689
diff
changeset
|
508 > EOF |
7e5031180c0f
transplant: fix crash if filter script munges log file
Luke Plant <L.Plant.98@cantab.net>
parents:
13689
diff
changeset
|
509 $ chmod +x test-filter-invalid-log |
7e5031180c0f
transplant: fix crash if filter script munges log file
Luke Plant <L.Plant.98@cantab.net>
parents:
13689
diff
changeset
|
510 $ hg transplant -s ../t --filter ./test-filter-invalid-log 0 |
7e5031180c0f
transplant: fix crash if filter script munges log file
Luke Plant <L.Plant.98@cantab.net>
parents:
13689
diff
changeset
|
511 filtering * (glob) |
13790
c0ed76b5056d
Fix transplant error message to correspond with test
Brendan Cully <brendan@kublai.com>
parents:
13789
diff
changeset
|
512 abort: filter corrupted changeset (no user or date) |
13789
7e5031180c0f
transplant: fix crash if filter script munges log file
Luke Plant <L.Plant.98@cantab.net>
parents:
13689
diff
changeset
|
513 [255] |
16912
6ef3107c661e
tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents:
16627
diff
changeset
|
514 $ cd .. |
11800
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
515 |
16972
5efe9c6a34fe
tests: add some missing #if's / hghave requirements
Mads Kiilerich <mads@kiilerich.com>
parents:
16912
diff
changeset
|
516 #endif |
5efe9c6a34fe
tests: add some missing #if's / hghave requirements
Mads Kiilerich <mads@kiilerich.com>
parents:
16912
diff
changeset
|
517 |
5efe9c6a34fe
tests: add some missing #if's / hghave requirements
Mads Kiilerich <mads@kiilerich.com>
parents:
16912
diff
changeset
|
518 |
11800
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
519 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
|
520 |
11800
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
521 $ hg init twin1 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
522 $ cd twin1 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
523 $ echo a > a |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
524 $ echo b > b |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
525 $ echo b >> b |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
526 $ hg ci -Am t |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
527 adding a |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
528 adding b |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
529 $ echo a > b |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
530 $ echo b >> b |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
531 $ hg ci -m changeb |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
532 $ cd .. |
9995
eba6c8687fd2
transplant: fix small bug when a patch fails while using --filter
Sune Foldager <cryo@cyanite.org>
parents:
8811
diff
changeset
|
533 |
11800
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
534 $ hg init twin2 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
535 $ cd twin2 |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
536 $ echo '[patch]' >> .hg/hgrc |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
537 $ echo 'eol = crlf' >> .hg/hgrc |
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
538 $ python -c "file('b', 'wb').write('b\r\nb\r\n')" |
14012
b247123d71f6
test-transplant: fix missing file addition
Patrick Mezard <pmezard@gmail.com>
parents:
12943
diff
changeset
|
539 $ hg ci -Am addb |
b247123d71f6
test-transplant: fix missing file addition
Patrick Mezard <pmezard@gmail.com>
parents:
12943
diff
changeset
|
540 adding b |
11800
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
541 $ hg transplant -s ../twin1 tip |
14012
b247123d71f6
test-transplant: fix missing file addition
Patrick Mezard <pmezard@gmail.com>
parents:
12943
diff
changeset
|
542 searching for changes |
b247123d71f6
test-transplant: fix missing file addition
Patrick Mezard <pmezard@gmail.com>
parents:
12943
diff
changeset
|
543 warning: repository is unrelated |
11800
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
544 applying 2e849d776c17 |
14012
b247123d71f6
test-transplant: fix missing file addition
Patrick Mezard <pmezard@gmail.com>
parents:
12943
diff
changeset
|
545 2e849d776c17 transplanted to 8e65bebc063e |
12943
7439ea4146f8
tests: use (esc) instead of other kinds of string escaping
Mads Kiilerich <mads@kiilerich.com>
parents:
12847
diff
changeset
|
546 $ cat b |
7439ea4146f8
tests: use (esc) instead of other kinds of string escaping
Mads Kiilerich <mads@kiilerich.com>
parents:
12847
diff
changeset
|
547 a\r (esc) |
7439ea4146f8
tests: use (esc) instead of other kinds of string escaping
Mads Kiilerich <mads@kiilerich.com>
parents:
12847
diff
changeset
|
548 b\r (esc) |
11800
88c3ff051270
tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9995
diff
changeset
|
549 $ cd .. |
16400
f2ba409dbb0f
transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents:
15446
diff
changeset
|
550 |
f2ba409dbb0f
transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents:
15446
diff
changeset
|
551 test transplant with merge changeset is skipped |
f2ba409dbb0f
transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents:
15446
diff
changeset
|
552 |
f2ba409dbb0f
transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents:
15446
diff
changeset
|
553 $ hg init merge1a |
f2ba409dbb0f
transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents:
15446
diff
changeset
|
554 $ cd merge1a |
f2ba409dbb0f
transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents:
15446
diff
changeset
|
555 $ echo a > a |
f2ba409dbb0f
transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents:
15446
diff
changeset
|
556 $ hg ci -Am a |
f2ba409dbb0f
transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents:
15446
diff
changeset
|
557 adding a |
f2ba409dbb0f
transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents:
15446
diff
changeset
|
558 $ hg branch b |
f2ba409dbb0f
transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents:
15446
diff
changeset
|
559 marked working directory as branch b |
f2ba409dbb0f
transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents:
15446
diff
changeset
|
560 (branches are permanent and global, did you want a bookmark?) |
f2ba409dbb0f
transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents:
15446
diff
changeset
|
561 $ hg ci -m branchb |
f2ba409dbb0f
transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents:
15446
diff
changeset
|
562 $ echo b > b |
f2ba409dbb0f
transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents:
15446
diff
changeset
|
563 $ hg ci -Am b |
f2ba409dbb0f
transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents:
15446
diff
changeset
|
564 adding b |
f2ba409dbb0f
transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents:
15446
diff
changeset
|
565 $ hg update default |
f2ba409dbb0f
transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents:
15446
diff
changeset
|
566 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
f2ba409dbb0f
transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents:
15446
diff
changeset
|
567 $ hg merge b |
f2ba409dbb0f
transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents:
15446
diff
changeset
|
568 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
f2ba409dbb0f
transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents:
15446
diff
changeset
|
569 (branch merge, don't forget to commit) |
f2ba409dbb0f
transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents:
15446
diff
changeset
|
570 $ hg ci -m mergeb |
f2ba409dbb0f
transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents:
15446
diff
changeset
|
571 $ cd .. |
f2ba409dbb0f
transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents:
15446
diff
changeset
|
572 |
f2ba409dbb0f
transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents:
15446
diff
changeset
|
573 $ hg init merge1b |
f2ba409dbb0f
transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents:
15446
diff
changeset
|
574 $ cd merge1b |
f2ba409dbb0f
transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents:
15446
diff
changeset
|
575 $ hg transplant -s ../merge1a tip |
16912
6ef3107c661e
tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents:
16627
diff
changeset
|
576 $ cd .. |
16400
f2ba409dbb0f
transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents:
15446
diff
changeset
|
577 |
f2ba409dbb0f
transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents:
15446
diff
changeset
|
578 test transplant with merge changeset accepts --parent |
f2ba409dbb0f
transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents:
15446
diff
changeset
|
579 |
f2ba409dbb0f
transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents:
15446
diff
changeset
|
580 $ hg init merge2a |
f2ba409dbb0f
transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents:
15446
diff
changeset
|
581 $ cd merge2a |
f2ba409dbb0f
transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents:
15446
diff
changeset
|
582 $ echo a > a |
f2ba409dbb0f
transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents:
15446
diff
changeset
|
583 $ hg ci -Am a |
f2ba409dbb0f
transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents:
15446
diff
changeset
|
584 adding a |
f2ba409dbb0f
transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents:
15446
diff
changeset
|
585 $ hg branch b |
f2ba409dbb0f
transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents:
15446
diff
changeset
|
586 marked working directory as branch b |
f2ba409dbb0f
transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents:
15446
diff
changeset
|
587 (branches are permanent and global, did you want a bookmark?) |
f2ba409dbb0f
transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents:
15446
diff
changeset
|
588 $ hg ci -m branchb |
f2ba409dbb0f
transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents:
15446
diff
changeset
|
589 $ echo b > b |
f2ba409dbb0f
transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents:
15446
diff
changeset
|
590 $ hg ci -Am b |
f2ba409dbb0f
transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents:
15446
diff
changeset
|
591 adding b |
f2ba409dbb0f
transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents:
15446
diff
changeset
|
592 $ hg update default |
f2ba409dbb0f
transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents:
15446
diff
changeset
|
593 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
f2ba409dbb0f
transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents:
15446
diff
changeset
|
594 $ hg merge b |
f2ba409dbb0f
transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents:
15446
diff
changeset
|
595 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
f2ba409dbb0f
transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents:
15446
diff
changeset
|
596 (branch merge, don't forget to commit) |
f2ba409dbb0f
transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents:
15446
diff
changeset
|
597 $ hg ci -m mergeb |
f2ba409dbb0f
transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents:
15446
diff
changeset
|
598 $ cd .. |
f2ba409dbb0f
transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents:
15446
diff
changeset
|
599 |
f2ba409dbb0f
transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents:
15446
diff
changeset
|
600 $ hg init merge2b |
f2ba409dbb0f
transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents:
15446
diff
changeset
|
601 $ cd merge2b |
f2ba409dbb0f
transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents:
15446
diff
changeset
|
602 $ hg transplant -s ../merge2a --parent 0 tip |
f2ba409dbb0f
transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents:
15446
diff
changeset
|
603 applying be9f9b39483f |
f2ba409dbb0f
transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents:
15446
diff
changeset
|
604 be9f9b39483f transplanted to 9959e51f94d1 |
16912
6ef3107c661e
tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents:
16627
diff
changeset
|
605 $ cd .. |
17319
a189d4470a34
transplant: handle non-empty patches doing nothing (issue2806)
Patrick Mezard <patrick@mezard.eu>
parents:
17186
diff
changeset
|
606 |
a189d4470a34
transplant: handle non-empty patches doing nothing (issue2806)
Patrick Mezard <patrick@mezard.eu>
parents:
17186
diff
changeset
|
607 test transplanting a patch turning into a no-op |
a189d4470a34
transplant: handle non-empty patches doing nothing (issue2806)
Patrick Mezard <patrick@mezard.eu>
parents:
17186
diff
changeset
|
608 |
a189d4470a34
transplant: handle non-empty patches doing nothing (issue2806)
Patrick Mezard <patrick@mezard.eu>
parents:
17186
diff
changeset
|
609 $ hg init binarysource |
a189d4470a34
transplant: handle non-empty patches doing nothing (issue2806)
Patrick Mezard <patrick@mezard.eu>
parents:
17186
diff
changeset
|
610 $ cd binarysource |
a189d4470a34
transplant: handle non-empty patches doing nothing (issue2806)
Patrick Mezard <patrick@mezard.eu>
parents:
17186
diff
changeset
|
611 $ echo a > a |
a189d4470a34
transplant: handle non-empty patches doing nothing (issue2806)
Patrick Mezard <patrick@mezard.eu>
parents:
17186
diff
changeset
|
612 $ hg ci -Am adda a |
a189d4470a34
transplant: handle non-empty patches doing nothing (issue2806)
Patrick Mezard <patrick@mezard.eu>
parents:
17186
diff
changeset
|
613 >>> file('b', 'wb').write('\0b1') |
a189d4470a34
transplant: handle non-empty patches doing nothing (issue2806)
Patrick Mezard <patrick@mezard.eu>
parents:
17186
diff
changeset
|
614 $ hg ci -Am addb b |
a189d4470a34
transplant: handle non-empty patches doing nothing (issue2806)
Patrick Mezard <patrick@mezard.eu>
parents:
17186
diff
changeset
|
615 >>> file('b', 'wb').write('\0b2') |
a189d4470a34
transplant: handle non-empty patches doing nothing (issue2806)
Patrick Mezard <patrick@mezard.eu>
parents:
17186
diff
changeset
|
616 $ hg ci -m changeb b |
a189d4470a34
transplant: handle non-empty patches doing nothing (issue2806)
Patrick Mezard <patrick@mezard.eu>
parents:
17186
diff
changeset
|
617 $ cd .. |
a189d4470a34
transplant: handle non-empty patches doing nothing (issue2806)
Patrick Mezard <patrick@mezard.eu>
parents:
17186
diff
changeset
|
618 |
a189d4470a34
transplant: handle non-empty patches doing nothing (issue2806)
Patrick Mezard <patrick@mezard.eu>
parents:
17186
diff
changeset
|
619 $ hg clone -r0 binarysource binarydest |
a189d4470a34
transplant: handle non-empty patches doing nothing (issue2806)
Patrick Mezard <patrick@mezard.eu>
parents:
17186
diff
changeset
|
620 adding changesets |
a189d4470a34
transplant: handle non-empty patches doing nothing (issue2806)
Patrick Mezard <patrick@mezard.eu>
parents:
17186
diff
changeset
|
621 adding manifests |
a189d4470a34
transplant: handle non-empty patches doing nothing (issue2806)
Patrick Mezard <patrick@mezard.eu>
parents:
17186
diff
changeset
|
622 adding file changes |
a189d4470a34
transplant: handle non-empty patches doing nothing (issue2806)
Patrick Mezard <patrick@mezard.eu>
parents:
17186
diff
changeset
|
623 added 1 changesets with 1 changes to 1 files |
a189d4470a34
transplant: handle non-empty patches doing nothing (issue2806)
Patrick Mezard <patrick@mezard.eu>
parents:
17186
diff
changeset
|
624 updating to branch default |
a189d4470a34
transplant: handle non-empty patches doing nothing (issue2806)
Patrick Mezard <patrick@mezard.eu>
parents:
17186
diff
changeset
|
625 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
a189d4470a34
transplant: handle non-empty patches doing nothing (issue2806)
Patrick Mezard <patrick@mezard.eu>
parents:
17186
diff
changeset
|
626 $ cd binarydest |
a189d4470a34
transplant: handle non-empty patches doing nothing (issue2806)
Patrick Mezard <patrick@mezard.eu>
parents:
17186
diff
changeset
|
627 $ cp ../binarysource/b b |
a189d4470a34
transplant: handle non-empty patches doing nothing (issue2806)
Patrick Mezard <patrick@mezard.eu>
parents:
17186
diff
changeset
|
628 $ hg ci -Am addb2 b |
a189d4470a34
transplant: handle non-empty patches doing nothing (issue2806)
Patrick Mezard <patrick@mezard.eu>
parents:
17186
diff
changeset
|
629 $ hg transplant -s ../binarysource 2 |
a189d4470a34
transplant: handle non-empty patches doing nothing (issue2806)
Patrick Mezard <patrick@mezard.eu>
parents:
17186
diff
changeset
|
630 searching for changes |
a189d4470a34
transplant: handle non-empty patches doing nothing (issue2806)
Patrick Mezard <patrick@mezard.eu>
parents:
17186
diff
changeset
|
631 applying 7a7d57e15850 |
17320
0c3c65c0d3fc
transplant: fix emptied changeset message
Patrick Mezard <patrick@mezard.eu>
parents:
17319
diff
changeset
|
632 skipping emptied changeset 7a7d57e15850 |
17319
a189d4470a34
transplant: handle non-empty patches doing nothing (issue2806)
Patrick Mezard <patrick@mezard.eu>
parents:
17186
diff
changeset
|
633 $ cd .. |
a189d4470a34
transplant: handle non-empty patches doing nothing (issue2806)
Patrick Mezard <patrick@mezard.eu>
parents:
17186
diff
changeset
|
634 |
17539
bc7377160fa7
tests: enable more server tests on Windows
Patrick Mezard <patrick@mezard.eu>
parents:
17320
diff
changeset
|
635 Explicitly kill daemons to let the test exit on Windows |
bc7377160fa7
tests: enable more server tests on Windows
Patrick Mezard <patrick@mezard.eu>
parents:
17320
diff
changeset
|
636 |
bc7377160fa7
tests: enable more server tests on Windows
Patrick Mezard <patrick@mezard.eu>
parents:
17320
diff
changeset
|
637 $ "$TESTDIR/killdaemons.py" $DAEMON_PIDS |
bc7377160fa7
tests: enable more server tests on Windows
Patrick Mezard <patrick@mezard.eu>
parents:
17320
diff
changeset
|
638 |