Mercurial > hg
comparison tests/test-empty-group @ 2339:11422943cf72
document and fix findincoming
- add documentation about what the function does, notably
the fact that it updates 'base'
- transform the workflow to a more simple 'if elif elif else'
- do not call remote.branches if not necessary
- some nodes where missing in 'base' (from what I understand,
if the root of a branch is missing but one parent is present,
the parent should be in 'base')
- add a testcase for an incorrect outgoing that is fixed by
this cset
- add a testcase for an empty group bug, it needs fixing
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Tue, 23 May 2006 10:44:40 +0200 |
parents | |
children | c0b449154a90 |
comparison
equal
deleted
inserted
replaced
2337:3f24bc5dee81 | 2339:11422943cf72 |
---|---|
1 #!/bin/sh | |
2 # | |
3 # A B | |
4 # | |
5 # 3 4 3 | |
6 # |\/| |\ | |
7 # |/\| | \ | |
8 # 1 2 1 2 | |
9 # \ / \ / | |
10 # 0 0 | |
11 # | |
12 # if the result of the merge of 1 and 2 | |
13 # is the same in 3 and 4, no new manifest | |
14 # will be created and the manifest group | |
15 # will be empty during the pull | |
16 # | |
17 # (plus we test a failure where outgoing | |
18 # wrongly reported the number of csets) | |
19 # | |
20 | |
21 hg init a | |
22 cd a | |
23 touch init | |
24 hg ci -A -m 0 -d "1000000 0" | |
25 touch x y | |
26 hg ci -A -m 1 -d "1000000 0" | |
27 hg update 0 | |
28 touch x y | |
29 hg ci -A -m 2 -d "1000000 0" | |
30 hg merge 1 | |
31 hg ci -A -m m1 -d "1000000 0" | |
32 #hg log | |
33 #hg debugindex .hg/00manifest.i | |
34 hg update -C 1 | |
35 hg merge 2 | |
36 hg ci -A -m m2 -d "1000000 0" | |
37 #hg log | |
38 #hg debugindex .hg/00manifest.i | |
39 | |
40 cd .. | |
41 hg clone -r 3 a b | |
42 hg clone -r 4 a c | |
43 hg -R a outgoing b | |
44 hg -R a outgoing c | |
45 hg -R b outgoing c | |
46 hg -R c outgoing b | |
47 | |
48 hg -R b pull a | |
49 hg -R c pull a |