Mercurial > hg-allpaths
comparison tests/groups-modern.t @ 48:00995da9c204
Implemented priorities, fixed bugs in ignoring, both should work.
Testfixes
author | Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl> |
---|---|
date | Sun, 25 Sep 2016 21:20:31 +0200 |
parents | e695060c716e |
children | 14a3ffbba22b |
comparison
equal
deleted
inserted
replaced
47:916b05f73b53 | 48:00995da9c204 |
---|---|
248 [255] | 248 [255] |
249 | 249 |
250 But global access works | 250 But global access works |
251 | 251 |
252 $ hg --cwd $BASE pushall | 252 $ hg --cwd $BASE pushall |
253 HMM | 253 pushing to */rep1 (glob) |
254 searching for changes | |
255 abort: push creates new remote head *! (glob) | |
256 (merge or see "hg help push" for details about pushing new heads) | |
257 [255] | |
254 | 258 |
255 $ hg --cwd $BASE pullall | 259 $ hg --cwd $BASE pullall |
256 HMM | 260 pulling from */rep1 (glob) |
261 searching for changes | |
262 no changes found | |
263 | |
264 pulling from */rep2 (glob) | |
265 searching for changes | |
266 adding changesets | |
267 adding manifests | |
268 adding file changes | |
269 added 1 changesets with 1 changes to 1 files | |
270 (run 'hg update' to get a working copy) | |
271 | |
272 pulling from */rep3 (glob) | |
273 searching for changes | |
274 no changes found | |
275 | |
276 pulling from */rep4 (glob) | |
277 searching for changes | |
278 no changes found | |
257 | 279 |
258 Finally let's test that push options work | 280 Finally let's test that push options work |
259 | 281 |
260 $ cat > $BASE/br1.txt << EOF | 282 $ cat > $BASE/br1.txt << EOF |
261 > Br1 text | 283 > Br1 text |
267 $ hg --cwd $BASE add | 289 $ hg --cwd $BASE add |
268 adding br1.txt | 290 adding br1.txt |
269 $ hg --cwd $BASE commit -m 'Br1' | 291 $ hg --cwd $BASE commit -m 'Br1' |
270 | 292 |
271 $ hg --cwd $BASE update default | 293 $ hg --cwd $BASE update default |
272 2 files updated, 0 files merged, 1 files removed, 0 files unresolved | 294 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
273 $ cat >> $BASE/file.txt << EOF | 295 $ cat >> $BASE/file.txt << EOF |
274 > later text | 296 > later text |
275 > EOF | 297 > EOF |
276 $ hg --cwd $BASE commit -m 'Normal' | 298 $ hg --cwd $BASE commit -m 'Normal' |
277 | 299 |
279 pushing to */rep1 (glob) | 301 pushing to */rep1 (glob) |
280 searching for changes | 302 searching for changes |
281 adding changesets | 303 adding changesets |
282 adding manifests | 304 adding manifests |
283 adding file changes | 305 adding file changes |
284 added 1 changesets with 1 changes to 1 files | 306 added 3 changesets with 3 changes to 1 files (+1 heads) |
285 | 307 |
286 pushing to */rep3 (glob) | 308 pushing to */rep3 (glob) |
287 searching for changes | 309 searching for changes |
288 adding changesets | 310 adding changesets |
289 adding manifests | 311 adding manifests |
290 adding file changes | 312 adding file changes |
291 added 2 changesets with 2 changes to 2 files | 313 added 3 changesets with 3 changes to 1 files |
292 | 314 |
293 $ hg --cwd $BASE log -T '{rev}: {desc}\n' | 315 $ hg --cwd $BASE log -T '{rev}: {desc}\n' |
316 5: Normal | |
317 4: Br1 | |
318 3: In repo2 | |
319 2: In repo1 | |
320 1: Second | |
321 0: First | |
322 | |
323 $ hg --cwd $REP1 log -T '{rev}: {desc}\n' | |
294 4: Normal | 324 4: Normal |
295 3: Br1 | 325 3: In repo2 |
296 2: In repo1 | 326 2: Second |
297 1: Second | |
298 0: First | |
299 | |
300 $ hg --cwd $REP1 log -T '{rev}: {desc}\n' | |
301 2: Normal | |
302 1: In repo1 | 327 1: In repo1 |
303 0: First | 328 0: First |
304 | 329 |
305 $ hg --cwd $REP2 log -T '{rev}: {desc}\n' | 330 $ hg --cwd $REP2 log -T '{rev}: {desc}\n' |
306 2: In repo2 | 331 2: In repo2 |
307 1: Second | 332 1: Second |
308 0: First | 333 0: First |
309 | 334 |
310 $ hg --cwd $REP3 log -T '{rev}: {desc}\n' | 335 $ hg --cwd $REP3 log -T '{rev}: {desc}\n' |
311 2: Normal | 336 3: Normal |
312 1: In repo1 | 337 2: In repo2 |
313 0: First | 338 1: Second |
314 | 339 0: First |
315 . | 340 |