Mercurial > hg
comparison tests/test-double-merge.t @ 11973:b773ca489fd3
tests: unify test-double-merge
author | Pradeepkumar Gayam <in3xes@gmail.com> |
---|---|
date | Wed, 18 Aug 2010 04:30:27 +0530 |
parents | tests/test-double-merge@6d36fc70754e |
children | 4c94b6d0fb1c |
comparison
equal
deleted
inserted
replaced
11972:b708cadc6e8f | 11973:b773ca489fd3 |
---|---|
1 $ hg init repo | |
2 $ cd repo | |
3 | |
4 $ echo line 1 > foo | |
5 $ hg ci -qAm 'add foo' -d "1000000 0" | |
6 | |
7 copy foo to bar and change both files | |
8 $ hg cp foo bar | |
9 $ echo line 2-1 >> foo | |
10 $ echo line 2-2 >> bar | |
11 $ hg ci -m 'cp foo bar; change both' -d "1000000 0" | |
12 | |
13 in another branch, change foo in a way that doesn't conflict with | |
14 the other changes | |
15 $ hg up -qC 0 | |
16 $ echo line 0 > foo | |
17 $ hg cat foo >> foo | |
18 $ hg ci -m 'change foo' -d "1000000 0" | |
19 created new head | |
20 | |
21 we get conflicts that shouldn't be there | |
22 $ hg merge -P | |
23 changeset: 1:d9da848d0adf | |
24 user: test | |
25 date: Mon Jan 12 13:46:40 1970 +0000 | |
26 summary: cp foo bar; change both | |
27 | |
28 $ hg merge --debug | |
29 searching for copies back to rev 1 | |
30 unmatched files in other: | |
31 bar | |
32 all copies found (* = to merge, ! = divergent): | |
33 bar -> foo * | |
34 checking for directory renames | |
35 resolving manifests | |
36 overwrite None partial False | |
37 ancestor 310fd17130da local 2092631ce82b+ remote d9da848d0adf | |
38 foo: versions differ -> m | |
39 foo: remote copied to bar -> m | |
40 preserving foo for resolve of bar | |
41 preserving foo for resolve of foo | |
42 updating: foo 1/2 files (50.00%) | |
43 picked tool 'internal:merge' for bar (binary False symlink False) | |
44 merging foo and bar to bar | |
45 my bar@2092631ce82b+ other bar@d9da848d0adf ancestor foo@310fd17130da | |
46 premerge successful | |
47 updating: foo 2/2 files (100.00%) | |
48 picked tool 'internal:merge' for foo (binary False symlink False) | |
49 merging foo | |
50 my foo@2092631ce82b+ other foo@d9da848d0adf ancestor foo@310fd17130da | |
51 premerge successful | |
52 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | |
53 (branch merge, don't forget to commit) | |
54 | |
55 contents of foo | |
56 $ cat foo | |
57 line 0 | |
58 line 1 | |
59 line 2-1 | |
60 | |
61 contents of bar | |
62 $ cat bar | |
63 line 0 | |
64 line 1 | |
65 line 2-2 |