author | Levi Bard <levi@unity3d.com> |
Sat, 07 Jan 2012 19:11:31 +0100 | |
changeset 15795 | 8bed8551d535 |
parent 15623 | fc8c7a5ccc4a |
child 16913 | f2719b387380 |
permissions | -rw-r--r-- |
15446
c5c9ca3719f9
tests: use 'hghave serve' to guard tests that requires serve daemon management
Mads Kiilerich <mads@kiilerich.com>
parents:
15244
diff
changeset
|
1 |
$ "$TESTDIR/hghave" serve || exit 80 |
c5c9ca3719f9
tests: use 'hghave serve' to guard tests that requires serve daemon management
Mads Kiilerich <mads@kiilerich.com>
parents:
15244
diff
changeset
|
2 |
|
12426 | 3 |
$ echo "[extensions]" >> $HGRCPATH |
4 |
$ echo "fetch=" >> $HGRCPATH |
|
6246
35bf9c23e17a
adjust test-fetch output to non-default HGPORT, e.g. with run-tests.py -j
Thomas Arendsen Hein <thomas@intevation.de>
parents:
6235
diff
changeset
|
5 |
|
12426 | 6 |
test fetch with default branches only |
2822
4f7abf341cd4
fetch: fix breakage from mpm.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
7 |
|
12426 | 8 |
$ hg init a |
9 |
$ echo a > a/a |
|
15244
f6d5d01725db
tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents:
15243
diff
changeset
|
10 |
$ hg --cwd a commit -Ama |
12426 | 11 |
adding a |
12 |
$ hg clone a b |
|
13 |
updating to branch default |
|
14 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
15 |
$ hg clone a c |
|
16 |
updating to branch default |
|
17 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
18 |
$ echo b > a/b |
|
15244
f6d5d01725db
tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents:
15243
diff
changeset
|
19 |
$ hg --cwd a commit -Amb |
12426 | 20 |
adding b |
21 |
$ hg --cwd a parents -q |
|
15244
f6d5d01725db
tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents:
15243
diff
changeset
|
22 |
1:d2ae7f538514 |
2822
4f7abf341cd4
fetch: fix breakage from mpm.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
23 |
|
12426 | 24 |
should pull one change |
2822
4f7abf341cd4
fetch: fix breakage from mpm.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
25 |
|
12426 | 26 |
$ hg --cwd b fetch ../a |
27 |
pulling from ../a |
|
28 |
searching for changes |
|
29 |
adding changesets |
|
30 |
adding manifests |
|
31 |
adding file changes |
|
32 |
added 1 changesets with 1 changes to 1 files |
|
33 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
34 |
$ hg --cwd b parents -q |
|
15244
f6d5d01725db
tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents:
15243
diff
changeset
|
35 |
1:d2ae7f538514 |
12426 | 36 |
$ echo c > c/c |
15244
f6d5d01725db
tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents:
15243
diff
changeset
|
37 |
$ hg --cwd c commit -Amc |
12426 | 38 |
adding c |
39 |
$ hg clone c d |
|
40 |
updating to branch default |
|
41 |
2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
42 |
$ hg clone c e |
|
43 |
updating to branch default |
|
44 |
2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
2822
4f7abf341cd4
fetch: fix breakage from mpm.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
45 |
|
12426 | 46 |
We cannot use the default commit message if fetching from a local |
47 |
repo, because the path of the repo will be included in the commit |
|
48 |
message, making every commit appear different. |
|
49 |
should merge c into a |
|
5798
86f5d8f608b7
fetch: hide authentication details
Bryan O'Sullivan <bos@serpentine.com>
parents:
2990
diff
changeset
|
50 |
|
15244
f6d5d01725db
tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents:
15243
diff
changeset
|
51 |
$ hg --cwd c fetch -d '0 0' -m 'automated merge' ../a |
12426 | 52 |
pulling from ../a |
53 |
searching for changes |
|
54 |
adding changesets |
|
55 |
adding manifests |
|
56 |
adding file changes |
|
57 |
added 1 changesets with 1 changes to 1 files (+1 heads) |
|
15244
f6d5d01725db
tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents:
15243
diff
changeset
|
58 |
updating to 2:d2ae7f538514 |
12426 | 59 |
1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
15244
f6d5d01725db
tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents:
15243
diff
changeset
|
60 |
merging with 1:d36c0562f908 |
12426 | 61 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
15244
f6d5d01725db
tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents:
15243
diff
changeset
|
62 |
new changeset 3:a323a0c43ec4 merges remote changes with local |
12426 | 63 |
$ ls c |
64 |
a |
|
65 |
b |
|
66 |
c |
|
67 |
$ hg --cwd a serve -a localhost -p $HGPORT -d --pid-file=hg.pid |
|
68 |
$ cat a/hg.pid >> "$DAEMON_PIDS" |
|
5798
86f5d8f608b7
fetch: hide authentication details
Bryan O'Sullivan <bos@serpentine.com>
parents:
2990
diff
changeset
|
69 |
|
12426 | 70 |
fetch over http, no auth |
5798
86f5d8f608b7
fetch: hide authentication details
Bryan O'Sullivan <bos@serpentine.com>
parents:
2990
diff
changeset
|
71 |
|
15244
f6d5d01725db
tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents:
15243
diff
changeset
|
72 |
$ hg --cwd d fetch http://localhost:$HGPORT/ |
12643
d08bb64888bc
tests: reintroduce ":$HGPORT" in test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12535
diff
changeset
|
73 |
pulling from http://localhost:$HGPORT/ |
12426 | 74 |
searching for changes |
75 |
adding changesets |
|
76 |
adding manifests |
|
77 |
adding file changes |
|
78 |
added 1 changesets with 1 changes to 1 files (+1 heads) |
|
15244
f6d5d01725db
tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents:
15243
diff
changeset
|
79 |
updating to 2:d2ae7f538514 |
12426 | 80 |
1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
15244
f6d5d01725db
tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents:
15243
diff
changeset
|
81 |
merging with 1:d36c0562f908 |
12426 | 82 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
12535
975ec4ce961c
tests: fix test-fetch port number variability
Matt Mackall <mpm@selenic.com>
parents:
12426
diff
changeset
|
83 |
new changeset 3:* merges remote changes with local (glob) |
12426 | 84 |
$ hg --cwd d tip --template '{desc}\n' |
12643
d08bb64888bc
tests: reintroduce ":$HGPORT" in test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12535
diff
changeset
|
85 |
Automated merge with http://localhost:$HGPORT/ |
6206
0b6f12495276
fetch: switch the default parent used for a merge
Bryan O'Sullivan <bos@serpentine.com>
parents:
5798
diff
changeset
|
86 |
|
12426 | 87 |
fetch over http with auth (should be hidden in desc) |
6206
0b6f12495276
fetch: switch the default parent used for a merge
Bryan O'Sullivan <bos@serpentine.com>
parents:
5798
diff
changeset
|
88 |
|
15244
f6d5d01725db
tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents:
15243
diff
changeset
|
89 |
$ hg --cwd e fetch http://user:password@localhost:$HGPORT/ |
12643
d08bb64888bc
tests: reintroduce ":$HGPORT" in test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12535
diff
changeset
|
90 |
pulling from http://user:***@localhost:$HGPORT/ |
12426 | 91 |
searching for changes |
92 |
adding changesets |
|
93 |
adding manifests |
|
94 |
adding file changes |
|
95 |
added 1 changesets with 1 changes to 1 files (+1 heads) |
|
15244
f6d5d01725db
tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents:
15243
diff
changeset
|
96 |
updating to 2:d2ae7f538514 |
12426 | 97 |
1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
15244
f6d5d01725db
tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents:
15243
diff
changeset
|
98 |
merging with 1:d36c0562f908 |
12426 | 99 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
12535
975ec4ce961c
tests: fix test-fetch port number variability
Matt Mackall <mpm@selenic.com>
parents:
12426
diff
changeset
|
100 |
new changeset 3:* merges remote changes with local (glob) |
12426 | 101 |
$ hg --cwd e tip --template '{desc}\n' |
12643
d08bb64888bc
tests: reintroduce ":$HGPORT" in test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12535
diff
changeset
|
102 |
Automated merge with http://localhost:$HGPORT/ |
12426 | 103 |
$ hg clone a f |
104 |
updating to branch default |
|
105 |
2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
106 |
$ hg clone a g |
|
107 |
updating to branch default |
|
108 |
2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
109 |
$ echo f > f/f |
|
15244
f6d5d01725db
tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents:
15243
diff
changeset
|
110 |
$ hg --cwd f ci -Amf |
12426 | 111 |
adding f |
112 |
$ echo g > g/g |
|
15244
f6d5d01725db
tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents:
15243
diff
changeset
|
113 |
$ hg --cwd g ci -Amg |
12426 | 114 |
adding g |
115 |
$ hg clone -q f h |
|
116 |
$ hg clone -q g i |
|
6206
0b6f12495276
fetch: switch the default parent used for a merge
Bryan O'Sullivan <bos@serpentine.com>
parents:
5798
diff
changeset
|
117 |
|
12426 | 118 |
should merge f into g |
6226
bd61e44eb2cc
fetch: don't proceed if working directory is missing files (issue988)
Bryan O'Sullivan <bos@serpentine.com>
parents:
6207
diff
changeset
|
119 |
|
15244
f6d5d01725db
tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents:
15243
diff
changeset
|
120 |
$ hg --cwd g fetch -d '0 0' --switch -m 'automated merge' ../f |
12426 | 121 |
pulling from ../f |
122 |
searching for changes |
|
123 |
adding changesets |
|
124 |
adding manifests |
|
125 |
adding file changes |
|
126 |
added 1 changesets with 1 changes to 1 files (+1 heads) |
|
127 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
15244
f6d5d01725db
tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents:
15243
diff
changeset
|
128 |
merging with 3:6343ca3eff20 |
12426 | 129 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
15244
f6d5d01725db
tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents:
15243
diff
changeset
|
130 |
new changeset 4:f7faa0b7d3c6 merges remote changes with local |
12426 | 131 |
$ rm i/g |
6226
bd61e44eb2cc
fetch: don't proceed if working directory is missing files (issue988)
Bryan O'Sullivan <bos@serpentine.com>
parents:
6207
diff
changeset
|
132 |
|
12426 | 133 |
should abort, because i is modified |
6235
d16798000be0
test-fetch failed due to non-zero exit code
Thomas Arendsen Hein <thomas@intevation.de>
parents:
6226
diff
changeset
|
134 |
|
12426 | 135 |
$ hg --cwd i fetch ../h |
136 |
abort: working directory is missing some files |
|
137 |
[255] |
|
7007
a6b74fbb5ce0
fetch: added support for named branches
Sune Foldager <cryo@cyanite.org>
parents:
6246
diff
changeset
|
138 |
|
12426 | 139 |
test fetch with named branches |
140 |
||
141 |
$ hg init nbase |
|
142 |
$ echo base > nbase/a |
|
15244
f6d5d01725db
tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents:
15243
diff
changeset
|
143 |
$ hg -R nbase ci -Am base |
12426 | 144 |
adding a |
145 |
$ hg -R nbase branch a |
|
146 |
marked working directory as branch a |
|
15615 | 147 |
(branches are permanent and global, did you want a bookmark?) |
12426 | 148 |
$ echo a > nbase/a |
15244
f6d5d01725db
tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents:
15243
diff
changeset
|
149 |
$ hg -R nbase ci -m a |
12426 | 150 |
$ hg -R nbase up -C 0 |
151 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
152 |
$ hg -R nbase branch b |
|
153 |
marked working directory as branch b |
|
15615 | 154 |
(branches are permanent and global, did you want a bookmark?) |
12426 | 155 |
$ echo b > nbase/b |
15244
f6d5d01725db
tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents:
15243
diff
changeset
|
156 |
$ hg -R nbase ci -Am b |
12426 | 157 |
adding b |
158 |
||
159 |
pull in change on foreign branch |
|
7007
a6b74fbb5ce0
fetch: added support for named branches
Sune Foldager <cryo@cyanite.org>
parents:
6246
diff
changeset
|
160 |
|
12426 | 161 |
$ hg clone nbase n1 |
162 |
updating to branch default |
|
163 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
164 |
$ hg clone nbase n2 |
|
165 |
updating to branch default |
|
166 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
167 |
$ hg -R n1 up -C a |
|
168 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
169 |
$ echo aa > n1/a |
|
15244
f6d5d01725db
tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents:
15243
diff
changeset
|
170 |
$ hg -R n1 ci -m a1 |
12426 | 171 |
$ hg -R n2 up -C b |
172 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
15244
f6d5d01725db
tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents:
15243
diff
changeset
|
173 |
$ hg -R n2 fetch -m 'merge' n1 |
12426 | 174 |
pulling from n1 |
175 |
searching for changes |
|
176 |
adding changesets |
|
177 |
adding manifests |
|
178 |
adding file changes |
|
179 |
added 1 changesets with 1 changes to 1 files |
|
7007
a6b74fbb5ce0
fetch: added support for named branches
Sune Foldager <cryo@cyanite.org>
parents:
6246
diff
changeset
|
180 |
|
12426 | 181 |
parent should be 2 (no automatic update) |
7007
a6b74fbb5ce0
fetch: added support for named branches
Sune Foldager <cryo@cyanite.org>
parents:
6246
diff
changeset
|
182 |
|
12426 | 183 |
$ hg -R n2 parents --template '{rev}\n' |
184 |
2 |
|
185 |
$ rm -fr n1 n2 |
|
186 |
||
187 |
pull in changes on both foreign and local branches |
|
7007
a6b74fbb5ce0
fetch: added support for named branches
Sune Foldager <cryo@cyanite.org>
parents:
6246
diff
changeset
|
188 |
|
12426 | 189 |
$ hg clone nbase n1 |
190 |
updating to branch default |
|
191 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
192 |
$ hg clone nbase n2 |
|
193 |
updating to branch default |
|
194 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
195 |
$ hg -R n1 up -C a |
|
196 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
197 |
$ echo aa > n1/a |
|
15244
f6d5d01725db
tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents:
15243
diff
changeset
|
198 |
$ hg -R n1 ci -m a1 |
12426 | 199 |
$ hg -R n1 up -C b |
200 |
2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
201 |
$ echo bb > n1/b |
|
15244
f6d5d01725db
tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents:
15243
diff
changeset
|
202 |
$ hg -R n1 ci -m b1 |
12426 | 203 |
$ hg -R n2 up -C b |
204 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
15244
f6d5d01725db
tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents:
15243
diff
changeset
|
205 |
$ hg -R n2 fetch -m 'merge' n1 |
12426 | 206 |
pulling from n1 |
207 |
searching for changes |
|
208 |
adding changesets |
|
209 |
adding manifests |
|
210 |
adding file changes |
|
211 |
added 2 changesets with 2 changes to 2 files |
|
212 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
7007
a6b74fbb5ce0
fetch: added support for named branches
Sune Foldager <cryo@cyanite.org>
parents:
6246
diff
changeset
|
213 |
|
12426 | 214 |
parent should be 4 (fast forward) |
215 |
||
216 |
$ hg -R n2 parents --template '{rev}\n' |
|
217 |
4 |
|
218 |
$ rm -fr n1 n2 |
|
219 |
||
220 |
pull changes on foreign (2 new heads) and local (1 new head) branches |
|
221 |
with a local change |
|
7007
a6b74fbb5ce0
fetch: added support for named branches
Sune Foldager <cryo@cyanite.org>
parents:
6246
diff
changeset
|
222 |
|
12426 | 223 |
$ hg clone nbase n1 |
224 |
updating to branch default |
|
225 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
226 |
$ hg clone nbase n2 |
|
227 |
updating to branch default |
|
228 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
229 |
$ hg -R n1 up -C a |
|
230 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
231 |
$ echo a1 > n1/a |
|
15244
f6d5d01725db
tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents:
15243
diff
changeset
|
232 |
$ hg -R n1 ci -m a1 |
12426 | 233 |
$ hg -R n1 up -C b |
234 |
2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
235 |
$ echo bb > n1/b |
|
15244
f6d5d01725db
tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents:
15243
diff
changeset
|
236 |
$ hg -R n1 ci -m b1 |
12426 | 237 |
$ hg -R n1 up -C 1 |
238 |
1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
239 |
$ echo a2 > n1/a |
|
15244
f6d5d01725db
tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents:
15243
diff
changeset
|
240 |
$ hg -R n1 ci -m a2 |
12426 | 241 |
created new head |
242 |
$ hg -R n2 up -C b |
|
243 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
244 |
$ echo change >> n2/c |
|
15244
f6d5d01725db
tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents:
15243
diff
changeset
|
245 |
$ hg -R n2 ci -A -m local |
12426 | 246 |
adding c |
15244
f6d5d01725db
tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents:
15243
diff
changeset
|
247 |
$ hg -R n2 fetch -d '0 0' -m 'merge' n1 |
12426 | 248 |
pulling from n1 |
249 |
searching for changes |
|
250 |
adding changesets |
|
251 |
adding manifests |
|
252 |
adding file changes |
|
253 |
added 3 changesets with 3 changes to 2 files (+2 heads) |
|
15244
f6d5d01725db
tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents:
15243
diff
changeset
|
254 |
updating to 5:3c4a837a864f |
12426 | 255 |
1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
15244
f6d5d01725db
tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents:
15243
diff
changeset
|
256 |
merging with 3:1267f84a9ea5 |
12426 | 257 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
15244
f6d5d01725db
tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents:
15243
diff
changeset
|
258 |
new changeset 7:2cf2a1261f21 merges remote changes with local |
7007
a6b74fbb5ce0
fetch: added support for named branches
Sune Foldager <cryo@cyanite.org>
parents:
6246
diff
changeset
|
259 |
|
12426 | 260 |
parent should be 7 (new merge changeset) |
7007
a6b74fbb5ce0
fetch: added support for named branches
Sune Foldager <cryo@cyanite.org>
parents:
6246
diff
changeset
|
261 |
|
12426 | 262 |
$ hg -R n2 parents --template '{rev}\n' |
263 |
7 |
|
264 |
$ rm -fr n1 n2 |
|
265 |
||
266 |
pull in changes on foreign (merge of local branch) and local (2 new |
|
267 |
heads) with a local change |
|
7007
a6b74fbb5ce0
fetch: added support for named branches
Sune Foldager <cryo@cyanite.org>
parents:
6246
diff
changeset
|
268 |
|
12426 | 269 |
$ hg clone nbase n1 |
270 |
updating to branch default |
|
271 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
272 |
$ hg clone nbase n2 |
|
273 |
updating to branch default |
|
274 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
275 |
$ hg -R n1 up -C a |
|
276 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
277 |
$ hg -R n1 merge b |
|
278 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
279 |
(branch merge, don't forget to commit) |
|
15244
f6d5d01725db
tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents:
15243
diff
changeset
|
280 |
$ hg -R n1 ci -m merge |
12426 | 281 |
$ hg -R n1 up -C 2 |
282 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
283 |
$ echo c > n1/a |
|
15244
f6d5d01725db
tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents:
15243
diff
changeset
|
284 |
$ hg -R n1 ci -m c |
12426 | 285 |
$ hg -R n1 up -C 2 |
286 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
287 |
$ echo cc > n1/a |
|
15244
f6d5d01725db
tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents:
15243
diff
changeset
|
288 |
$ hg -R n1 ci -m cc |
12426 | 289 |
created new head |
290 |
$ hg -R n2 up -C b |
|
291 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
292 |
$ echo change >> n2/b |
|
15244
f6d5d01725db
tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents:
15243
diff
changeset
|
293 |
$ hg -R n2 ci -A -m local |
f6d5d01725db
tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents:
15243
diff
changeset
|
294 |
$ hg -R n2 fetch -m 'merge' n1 |
12426 | 295 |
pulling from n1 |
296 |
searching for changes |
|
297 |
adding changesets |
|
298 |
adding manifests |
|
299 |
adding file changes |
|
300 |
added 3 changesets with 2 changes to 1 files (+2 heads) |
|
301 |
not merging with 1 other new branch heads (use "hg heads ." and "hg merge" to merge them) |
|
12711
b885f28fa4fa
fetch: fix and document exit codes (issue2356)
Matt Mackall <mpm@selenic.com>
parents:
12643
diff
changeset
|
302 |
[1] |
7049
6489ee64b522
fetch: use dirstate branch instead of first parents
Sune Foldager <cryo@cyanite.org>
parents:
7007
diff
changeset
|
303 |
|
12426 | 304 |
parent should be 3 (fetch did not merge anything) |
305 |
||
306 |
$ hg -R n2 parents --template '{rev}\n' |
|
307 |
3 |
|
308 |
$ rm -fr n1 n2 |
|
309 |
||
310 |
pull in change on different branch than dirstate |
|
311 |
||
312 |
$ hg init n1 |
|
313 |
$ echo a > n1/a |
|
314 |
$ hg -R n1 ci -Am initial |
|
315 |
adding a |
|
316 |
$ hg clone n1 n2 |
|
317 |
updating to branch default |
|
318 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
319 |
$ echo b > n1/a |
|
320 |
$ hg -R n1 ci -m next |
|
321 |
$ hg -R n2 branch topic |
|
322 |
marked working directory as branch topic |
|
15615 | 323 |
(branches are permanent and global, did you want a bookmark?) |
15244
f6d5d01725db
tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com>
parents:
15243
diff
changeset
|
324 |
$ hg -R n2 fetch -m merge n1 |
12426 | 325 |
abort: working dir not at branch tip (use "hg update" to check out branch tip) |
326 |
[255] |
|
327 |
||
328 |
parent should be 0 (fetch did not update or merge anything) |
|
329 |
||
330 |
$ hg -R n2 parents --template '{rev}\n' |
|
331 |
0 |
|
332 |
$ rm -fr n1 n2 |
|
333 |
||
334 |
test fetch with inactive branches |
|
7855
aa1a87f7544f
regression test for issue1552
Benjamin Pollack <benjamin@bitquabit.com>
parents:
7344
diff
changeset
|
335 |
|
12426 | 336 |
$ hg init ib1 |
337 |
$ echo a > ib1/a |
|
338 |
$ hg --cwd ib1 ci -Am base |
|
339 |
adding a |
|
340 |
$ hg --cwd ib1 branch second |
|
341 |
marked working directory as branch second |
|
15615 | 342 |
(branches are permanent and global, did you want a bookmark?) |
12426 | 343 |
$ echo b > ib1/b |
344 |
$ hg --cwd ib1 ci -Am onsecond |
|
345 |
adding b |
|
346 |
$ hg --cwd ib1 branch -f default |
|
347 |
marked working directory as branch default |
|
15615 | 348 |
(branches are permanent and global, did you want a bookmark?) |
12426 | 349 |
$ echo c > ib1/c |
350 |
$ hg --cwd ib1 ci -Am newdefault |
|
351 |
adding c |
|
352 |
created new head |
|
353 |
$ hg clone ib1 ib2 |
|
354 |
updating to branch default |
|
355 |
3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
356 |
||
357 |
fetch should succeed |
|
358 |
||
359 |
$ hg --cwd ib2 fetch ../ib1 |
|
360 |
pulling from ../ib1 |
|
361 |
searching for changes |
|
362 |
no changes found |
|
363 |
$ rm -fr ib1 ib2 |
|
364 |
||
365 |
test issue1726 |
|
9093
0b2b269ba3d0
branch heads: fix regression introduced in e67e5b60e55f (issue1726)
Henrik Stuart <hg@hstuart.dk>
parents:
7855
diff
changeset
|
366 |
|
12426 | 367 |
$ hg init i1726r1 |
368 |
$ echo a > i1726r1/a |
|
369 |
$ hg --cwd i1726r1 ci -Am base |
|
370 |
adding a |
|
371 |
$ hg clone i1726r1 i1726r2 |
|
372 |
updating to branch default |
|
373 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
374 |
$ echo b > i1726r1/a |
|
375 |
$ hg --cwd i1726r1 ci -m second |
|
376 |
$ echo c > i1726r2/a |
|
377 |
$ hg --cwd i1726r2 ci -m third |
|
378 |
$ HGMERGE=true hg --cwd i1726r2 fetch ../i1726r1 |
|
379 |
pulling from ../i1726r1 |
|
380 |
searching for changes |
|
381 |
adding changesets |
|
382 |
adding manifests |
|
383 |
adding file changes |
|
384 |
added 1 changesets with 1 changes to 1 files (+1 heads) |
|
385 |
updating to 2:7837755a2789 |
|
386 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
387 |
merging with 1:d1f0c6c48ebd |
|
388 |
merging a |
|
389 |
0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
390 |
new changeset 3:* merges remote changes with local (glob) |
|
391 |
$ hg --cwd i1726r2 heads default --template '{rev}\n' |
|
392 |
3 |
|
10580
612c142b7a82
fetch: fix newheads calculation (issue2047)
Sune Foldager <cryo@cyanite.org>
parents:
10398
diff
changeset
|
393 |
|
12426 | 394 |
test issue2047 |
7344
58fd3c718ca4
tests: add killdaemons helper script
Matt Mackall <mpm@selenic.com>
parents:
7049
diff
changeset
|
395 |
|
12426 | 396 |
$ hg -q init i2047a |
397 |
$ cd i2047a |
|
398 |
$ echo a > a |
|
399 |
$ hg -q ci -Am a |
|
400 |
$ hg -q branch stable |
|
401 |
$ echo b > b |
|
402 |
$ hg -q ci -Am b |
|
403 |
$ cd .. |
|
404 |
$ hg -q clone -r 0 i2047a i2047b |
|
405 |
$ cd i2047b |
|
406 |
$ hg fetch ../i2047a |
|
407 |
pulling from ../i2047a |
|
408 |
searching for changes |
|
409 |
adding changesets |
|
410 |
adding manifests |
|
411 |
adding file changes |
|
412 |
added 1 changesets with 1 changes to 1 files |