Mercurial > hg
annotate tests/test-merge-criss-cross.t @ 44197:17e12938f8e7
copies: print debug information about copies per side/branch
Differential Revision: https://phab.mercurial-scm.org/D7987
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Fri, 24 Jan 2020 10:39:55 -0800 |
parents | baf3fe2977cc |
children | e7c8a5030a90 |
rev | line source |
---|---|
20636
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
1 Criss cross merging |
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
2 |
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
3 $ hg init criss-cross |
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
4 $ cd criss-cross |
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
5 $ echo '0 base' > f1 |
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
6 $ echo '0 base' > f2 |
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
7 $ hg ci -Aqm '0 base' |
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
8 |
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
9 $ echo '1 first change' > f1 |
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
10 $ hg ci -m '1 first change f1' |
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
11 |
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
12 $ hg up -qr0 |
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
13 $ echo '2 first change' > f2 |
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
14 $ hg ci -qm '2 first change f2' |
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
15 |
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
16 $ hg merge -qr 1 |
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
17 $ hg ci -m '3 merge' |
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
18 |
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
19 $ hg up -qr2 |
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
20 $ hg merge -qr1 |
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
21 $ hg ci -qm '4 merge' |
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
22 |
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
23 $ echo '5 second change' > f1 |
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
24 $ hg ci -m '5 second change f1' |
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
25 |
21125
e94e90a4526e
context: tell when .ancestor picks one of multiple common ancestors heads
Mads Kiilerich <madski@unity3d.com>
parents:
20636
diff
changeset
|
26 $ hg up -r3 |
42154
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
27 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
20636
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
28 $ echo '6 second change' > f2 |
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
29 $ hg ci -m '6 second change f2' |
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
30 |
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
31 $ hg log -G |
42154
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
32 @ changeset: 6:3b08d01b0ab5 |
20636
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
33 | tag: tip |
42154
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
34 | parent: 3:cf89f02107e5 |
20636
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
35 | user: test |
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
36 | date: Thu Jan 01 00:00:00 1970 +0000 |
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
37 | summary: 6 second change f2 |
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
38 | |
42154
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
39 | o changeset: 5:adfe50279922 |
20636
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
40 | | user: test |
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
41 | | date: Thu Jan 01 00:00:00 1970 +0000 |
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
42 | | summary: 5 second change f1 |
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
43 | | |
42154
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
44 | o changeset: 4:7d3e55501ae6 |
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
45 | |\ parent: 2:40663881a6dd |
20636
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
46 | | | parent: 1:0f6b37dbe527 |
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
47 | | | user: test |
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
48 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
49 | | | summary: 4 merge |
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
50 | | | |
42154
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
51 o---+ changeset: 3:cf89f02107e5 |
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
52 | | | parent: 2:40663881a6dd |
20636
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
53 |/ / parent: 1:0f6b37dbe527 |
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
54 | | user: test |
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
55 | | date: Thu Jan 01 00:00:00 1970 +0000 |
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
56 | | summary: 3 merge |
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
57 | | |
42154
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
58 | o changeset: 2:40663881a6dd |
20636
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
59 | | parent: 0:40494bf2444c |
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
60 | | user: test |
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
61 | | date: Thu Jan 01 00:00:00 1970 +0000 |
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
62 | | summary: 2 first change f2 |
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
63 | | |
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
64 o | changeset: 1:0f6b37dbe527 |
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
65 |/ user: test |
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
66 | date: Thu Jan 01 00:00:00 1970 +0000 |
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
67 | summary: 1 first change f1 |
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
68 | |
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
69 o changeset: 0:40494bf2444c |
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
70 user: test |
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
71 date: Thu Jan 01 00:00:00 1970 +0000 |
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
72 summary: 0 base |
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
73 |
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
74 |
22672
19903277f035
merge: use bid merge by default (BC)
Mads Kiilerich <madski@unity3d.com>
parents:
22671
diff
changeset
|
75 $ hg merge -v --debug --tool internal:dump 5 --config merge.preferancestor='!' |
42154
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
76 note: using 0f6b37dbe527 as ancestor of 3b08d01b0ab5 and adfe50279922 |
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
77 alternatively, use --config merge.preferancestor=40663881a6dd |
20636
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
78 resolving manifests |
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
79 branchmerge: True, force: False, partial: False |
42154
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
80 ancestor: 0f6b37dbe527, local: 3b08d01b0ab5+, remote: adfe50279922 |
21391
cb15835456cb
merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents:
21389
diff
changeset
|
81 preserving f2 for resolve of f2 |
20636
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
82 f1: remote is newer -> g |
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
83 getting f1 |
26618
8e6d5b7317e6
merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
26611
diff
changeset
|
84 f2: versions differ -> m (premerge) |
27161
296d55def9c4
filemerge: add debug output for whether this is a change/delete conflict
Siddharth Agarwal <sid0@fb.com>
parents:
26618
diff
changeset
|
85 picked tool ':dump' for f2 (binary False symlink False changedelete False) |
20636
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
86 merging f2 |
42154
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
87 my f2@3b08d01b0ab5+ other f2@adfe50279922 ancestor f2@0f6b37dbe527 |
26618
8e6d5b7317e6
merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
26611
diff
changeset
|
88 f2: versions differ -> m (merge) |
27161
296d55def9c4
filemerge: add debug output for whether this is a change/delete conflict
Siddharth Agarwal <sid0@fb.com>
parents:
26618
diff
changeset
|
89 picked tool ':dump' for f2 (binary False symlink False changedelete False) |
42154
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
90 my f2@3b08d01b0ab5+ other f2@adfe50279922 ancestor f2@0f6b37dbe527 |
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
91 1 files updated, 0 files merged, 0 files removed, 1 files unresolved |
35704
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35393
diff
changeset
|
92 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
20636
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
93 [1] |
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
94 |
42154
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
95 $ f --dump * |
30855
72c36a2be2d6
tests: use 'f' in test-merge-criss-cross.t to prepare for recursive dumping
Mads Kiilerich <mads@kiilerich.com>
parents:
28065
diff
changeset
|
96 f1: |
72c36a2be2d6
tests: use 'f' in test-merge-criss-cross.t to prepare for recursive dumping
Mads Kiilerich <mads@kiilerich.com>
parents:
28065
diff
changeset
|
97 >>> |
20636
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
98 5 second change |
30855
72c36a2be2d6
tests: use 'f' in test-merge-criss-cross.t to prepare for recursive dumping
Mads Kiilerich <mads@kiilerich.com>
parents:
28065
diff
changeset
|
99 <<< |
72c36a2be2d6
tests: use 'f' in test-merge-criss-cross.t to prepare for recursive dumping
Mads Kiilerich <mads@kiilerich.com>
parents:
28065
diff
changeset
|
100 f2: |
72c36a2be2d6
tests: use 'f' in test-merge-criss-cross.t to prepare for recursive dumping
Mads Kiilerich <mads@kiilerich.com>
parents:
28065
diff
changeset
|
101 >>> |
20636
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
102 6 second change |
30855
72c36a2be2d6
tests: use 'f' in test-merge-criss-cross.t to prepare for recursive dumping
Mads Kiilerich <mads@kiilerich.com>
parents:
28065
diff
changeset
|
103 <<< |
72c36a2be2d6
tests: use 'f' in test-merge-criss-cross.t to prepare for recursive dumping
Mads Kiilerich <mads@kiilerich.com>
parents:
28065
diff
changeset
|
104 f2.base: |
72c36a2be2d6
tests: use 'f' in test-merge-criss-cross.t to prepare for recursive dumping
Mads Kiilerich <mads@kiilerich.com>
parents:
28065
diff
changeset
|
105 >>> |
20636
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
106 0 base |
30855
72c36a2be2d6
tests: use 'f' in test-merge-criss-cross.t to prepare for recursive dumping
Mads Kiilerich <mads@kiilerich.com>
parents:
28065
diff
changeset
|
107 <<< |
72c36a2be2d6
tests: use 'f' in test-merge-criss-cross.t to prepare for recursive dumping
Mads Kiilerich <mads@kiilerich.com>
parents:
28065
diff
changeset
|
108 f2.local: |
72c36a2be2d6
tests: use 'f' in test-merge-criss-cross.t to prepare for recursive dumping
Mads Kiilerich <mads@kiilerich.com>
parents:
28065
diff
changeset
|
109 >>> |
20636
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
110 6 second change |
30855
72c36a2be2d6
tests: use 'f' in test-merge-criss-cross.t to prepare for recursive dumping
Mads Kiilerich <mads@kiilerich.com>
parents:
28065
diff
changeset
|
111 <<< |
72c36a2be2d6
tests: use 'f' in test-merge-criss-cross.t to prepare for recursive dumping
Mads Kiilerich <mads@kiilerich.com>
parents:
28065
diff
changeset
|
112 f2.orig: |
72c36a2be2d6
tests: use 'f' in test-merge-criss-cross.t to prepare for recursive dumping
Mads Kiilerich <mads@kiilerich.com>
parents:
28065
diff
changeset
|
113 >>> |
20636
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
114 6 second change |
30855
72c36a2be2d6
tests: use 'f' in test-merge-criss-cross.t to prepare for recursive dumping
Mads Kiilerich <mads@kiilerich.com>
parents:
28065
diff
changeset
|
115 <<< |
72c36a2be2d6
tests: use 'f' in test-merge-criss-cross.t to prepare for recursive dumping
Mads Kiilerich <mads@kiilerich.com>
parents:
28065
diff
changeset
|
116 f2.other: |
72c36a2be2d6
tests: use 'f' in test-merge-criss-cross.t to prepare for recursive dumping
Mads Kiilerich <mads@kiilerich.com>
parents:
28065
diff
changeset
|
117 >>> |
20636
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
118 2 first change |
30855
72c36a2be2d6
tests: use 'f' in test-merge-criss-cross.t to prepare for recursive dumping
Mads Kiilerich <mads@kiilerich.com>
parents:
28065
diff
changeset
|
119 <<< |
20636
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
120 |
21126
99b5eaf372a7
context: introduce merge.preferancestor for controlling which ancestor to pick
Mads Kiilerich <madski@unity3d.com>
parents:
21125
diff
changeset
|
121 $ hg up -qC . |
99b5eaf372a7
context: introduce merge.preferancestor for controlling which ancestor to pick
Mads Kiilerich <madski@unity3d.com>
parents:
21125
diff
changeset
|
122 $ hg merge -v --tool internal:dump 5 --config merge.preferancestor="null 40663881 3b08d" |
42154
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
123 note: using 40663881a6dd as ancestor of 3b08d01b0ab5 and adfe50279922 |
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
124 alternatively, use --config merge.preferancestor=0f6b37dbe527 |
21126
99b5eaf372a7
context: introduce merge.preferancestor for controlling which ancestor to pick
Mads Kiilerich <madski@unity3d.com>
parents:
21125
diff
changeset
|
125 resolving manifests |
42154
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
126 merging f1 |
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
127 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
35704
41ef02ba329b
merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents:
35393
diff
changeset
|
128 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
21126
99b5eaf372a7
context: introduce merge.preferancestor for controlling which ancestor to pick
Mads Kiilerich <madski@unity3d.com>
parents:
21125
diff
changeset
|
129 [1] |
99b5eaf372a7
context: introduce merge.preferancestor for controlling which ancestor to pick
Mads Kiilerich <madski@unity3d.com>
parents:
21125
diff
changeset
|
130 |
21128
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
131 Redo merge with merge.preferancestor="*" to enable bid merge |
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
132 |
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
133 $ rm f* |
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
134 $ hg up -qC . |
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
135 $ hg merge -v --debug --tool internal:dump 5 --config merge.preferancestor="*" |
42154
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
136 note: merging 3b08d01b0ab5+ and adfe50279922 using bids from ancestors 0f6b37dbe527 and 40663881a6dd |
21128
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
137 |
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
138 calculating bids for ancestor 0f6b37dbe527 |
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
139 resolving manifests |
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
140 branchmerge: True, force: False, partial: False |
42154
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
141 ancestor: 0f6b37dbe527, local: 3b08d01b0ab5+, remote: adfe50279922 |
21269
fa601c4e03f9
merge: make debug output slightly more helpful by including message for action
Mads Kiilerich <madski@unity3d.com>
parents:
21172
diff
changeset
|
142 f1: remote is newer -> g |
fa601c4e03f9
merge: make debug output slightly more helpful by including message for action
Mads Kiilerich <madski@unity3d.com>
parents:
21172
diff
changeset
|
143 f2: versions differ -> m |
21128
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
144 |
42154
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
145 calculating bids for ancestor 40663881a6dd |
21128
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
146 resolving manifests |
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
147 branchmerge: True, force: False, partial: False |
42154
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
148 ancestor: 40663881a6dd, local: 3b08d01b0ab5+, remote: adfe50279922 |
23638
09be050ca98c
merge: let bid merge work on the file->action dict
Martin von Zweigbergk <martinvonz@google.com>
parents:
23482
diff
changeset
|
149 f1: versions differ -> m |
23482
208ec8ca7c79
merge: make 'keep' message more descriptive
Martin von Zweigbergk <martinvonz@google.com>
parents:
22673
diff
changeset
|
150 f2: remote unchanged -> k |
21128
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
151 |
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
152 auction for merging merge bids |
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
153 f1: picking 'get' action |
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
154 f2: picking 'keep' action |
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
155 end of auction |
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
156 |
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
157 f1: remote is newer -> g |
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
158 getting f1 |
23482
208ec8ca7c79
merge: make 'keep' message more descriptive
Martin von Zweigbergk <martinvonz@google.com>
parents:
22673
diff
changeset
|
159 f2: remote unchanged -> k |
42154
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
160 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
21128
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
161 (branch merge, don't forget to commit) |
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
162 |
42154
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
163 $ f --dump * |
30855
72c36a2be2d6
tests: use 'f' in test-merge-criss-cross.t to prepare for recursive dumping
Mads Kiilerich <mads@kiilerich.com>
parents:
28065
diff
changeset
|
164 f1: |
72c36a2be2d6
tests: use 'f' in test-merge-criss-cross.t to prepare for recursive dumping
Mads Kiilerich <mads@kiilerich.com>
parents:
28065
diff
changeset
|
165 >>> |
21128
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
166 5 second change |
30855
72c36a2be2d6
tests: use 'f' in test-merge-criss-cross.t to prepare for recursive dumping
Mads Kiilerich <mads@kiilerich.com>
parents:
28065
diff
changeset
|
167 <<< |
72c36a2be2d6
tests: use 'f' in test-merge-criss-cross.t to prepare for recursive dumping
Mads Kiilerich <mads@kiilerich.com>
parents:
28065
diff
changeset
|
168 f2: |
72c36a2be2d6
tests: use 'f' in test-merge-criss-cross.t to prepare for recursive dumping
Mads Kiilerich <mads@kiilerich.com>
parents:
28065
diff
changeset
|
169 >>> |
21128
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
170 6 second change |
30855
72c36a2be2d6
tests: use 'f' in test-merge-criss-cross.t to prepare for recursive dumping
Mads Kiilerich <mads@kiilerich.com>
parents:
28065
diff
changeset
|
171 <<< |
21128
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
172 |
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
173 |
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
174 The other way around: |
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
175 |
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
176 $ hg up -C -r5 |
42154
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
177 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
21128
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
178 $ hg merge -v --debug --config merge.preferancestor="*" |
42154
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
179 note: merging adfe50279922+ and 3b08d01b0ab5 using bids from ancestors 0f6b37dbe527 and 40663881a6dd |
21128
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
180 |
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
181 calculating bids for ancestor 0f6b37dbe527 |
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
182 resolving manifests |
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
183 branchmerge: True, force: False, partial: False |
42154
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
184 ancestor: 0f6b37dbe527, local: adfe50279922+, remote: 3b08d01b0ab5 |
23482
208ec8ca7c79
merge: make 'keep' message more descriptive
Martin von Zweigbergk <martinvonz@google.com>
parents:
22673
diff
changeset
|
185 f1: remote unchanged -> k |
21269
fa601c4e03f9
merge: make debug output slightly more helpful by including message for action
Mads Kiilerich <madski@unity3d.com>
parents:
21172
diff
changeset
|
186 f2: versions differ -> m |
21128
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
187 |
42154
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
188 calculating bids for ancestor 40663881a6dd |
21128
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
189 resolving manifests |
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
190 branchmerge: True, force: False, partial: False |
42154
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
191 ancestor: 40663881a6dd, local: adfe50279922+, remote: 3b08d01b0ab5 |
23638
09be050ca98c
merge: let bid merge work on the file->action dict
Martin von Zweigbergk <martinvonz@google.com>
parents:
23482
diff
changeset
|
192 f1: versions differ -> m |
21391
cb15835456cb
merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents:
21389
diff
changeset
|
193 f2: remote is newer -> g |
21128
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
194 |
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
195 auction for merging merge bids |
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
196 f1: picking 'keep' action |
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
197 f2: picking 'get' action |
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
198 end of auction |
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
199 |
21389
e741972017d9
merge: change priority / ordering of merge actions
Mads Kiilerich <madski@unity3d.com>
parents:
21269
diff
changeset
|
200 f2: remote is newer -> g |
21128
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
201 getting f2 |
23482
208ec8ca7c79
merge: make 'keep' message more descriptive
Martin von Zweigbergk <martinvonz@google.com>
parents:
22673
diff
changeset
|
202 f1: remote unchanged -> k |
42154
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
203 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
21128
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
204 (branch merge, don't forget to commit) |
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
205 |
42154
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
206 $ f --dump * |
30855
72c36a2be2d6
tests: use 'f' in test-merge-criss-cross.t to prepare for recursive dumping
Mads Kiilerich <mads@kiilerich.com>
parents:
28065
diff
changeset
|
207 f1: |
72c36a2be2d6
tests: use 'f' in test-merge-criss-cross.t to prepare for recursive dumping
Mads Kiilerich <mads@kiilerich.com>
parents:
28065
diff
changeset
|
208 >>> |
21128
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
209 5 second change |
30855
72c36a2be2d6
tests: use 'f' in test-merge-criss-cross.t to prepare for recursive dumping
Mads Kiilerich <mads@kiilerich.com>
parents:
28065
diff
changeset
|
210 <<< |
72c36a2be2d6
tests: use 'f' in test-merge-criss-cross.t to prepare for recursive dumping
Mads Kiilerich <mads@kiilerich.com>
parents:
28065
diff
changeset
|
211 f2: |
72c36a2be2d6
tests: use 'f' in test-merge-criss-cross.t to prepare for recursive dumping
Mads Kiilerich <mads@kiilerich.com>
parents:
28065
diff
changeset
|
212 >>> |
21128
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
213 6 second change |
30855
72c36a2be2d6
tests: use 'f' in test-merge-criss-cross.t to prepare for recursive dumping
Mads Kiilerich <mads@kiilerich.com>
parents:
28065
diff
changeset
|
214 <<< |
21128
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
215 |
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
216 Verify how the output looks and and how verbose it is: |
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
217 |
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
218 $ hg up -qC |
22672
19903277f035
merge: use bid merge by default (BC)
Mads Kiilerich <madski@unity3d.com>
parents:
22671
diff
changeset
|
219 $ hg merge |
42154
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
220 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
21128
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
221 (branch merge, don't forget to commit) |
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
222 |
28065
6b1fc09c699a
update: change default destination to tipmost descendant (issue4673) (BC)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
28011
diff
changeset
|
223 $ hg up -qC tip |
22672
19903277f035
merge: use bid merge by default (BC)
Mads Kiilerich <madski@unity3d.com>
parents:
22671
diff
changeset
|
224 $ hg merge -v |
42154
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
225 note: merging 3b08d01b0ab5+ and adfe50279922 using bids from ancestors 0f6b37dbe527 and 40663881a6dd |
21128
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
226 |
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
227 calculating bids for ancestor 0f6b37dbe527 |
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
228 resolving manifests |
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
229 |
42154
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
230 calculating bids for ancestor 40663881a6dd |
21128
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
231 resolving manifests |
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
232 |
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
233 auction for merging merge bids |
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
234 f1: picking 'get' action |
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
235 f2: picking 'keep' action |
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
236 end of auction |
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
237 |
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
238 getting f1 |
42154
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
239 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
21128
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
240 (branch merge, don't forget to commit) |
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
241 |
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
242 $ hg up -qC |
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
243 $ hg merge -v --debug --config merge.preferancestor="*" |
42154
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
244 note: merging 3b08d01b0ab5+ and adfe50279922 using bids from ancestors 0f6b37dbe527 and 40663881a6dd |
21128
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
245 |
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
246 calculating bids for ancestor 0f6b37dbe527 |
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
247 resolving manifests |
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
248 branchmerge: True, force: False, partial: False |
42154
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
249 ancestor: 0f6b37dbe527, local: 3b08d01b0ab5+, remote: adfe50279922 |
21269
fa601c4e03f9
merge: make debug output slightly more helpful by including message for action
Mads Kiilerich <madski@unity3d.com>
parents:
21172
diff
changeset
|
250 f1: remote is newer -> g |
fa601c4e03f9
merge: make debug output slightly more helpful by including message for action
Mads Kiilerich <madski@unity3d.com>
parents:
21172
diff
changeset
|
251 f2: versions differ -> m |
21128
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
252 |
42154
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
253 calculating bids for ancestor 40663881a6dd |
21128
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
254 resolving manifests |
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
255 branchmerge: True, force: False, partial: False |
42154
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
256 ancestor: 40663881a6dd, local: 3b08d01b0ab5+, remote: adfe50279922 |
23638
09be050ca98c
merge: let bid merge work on the file->action dict
Martin von Zweigbergk <martinvonz@google.com>
parents:
23482
diff
changeset
|
257 f1: versions differ -> m |
23482
208ec8ca7c79
merge: make 'keep' message more descriptive
Martin von Zweigbergk <martinvonz@google.com>
parents:
22673
diff
changeset
|
258 f2: remote unchanged -> k |
21128
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
259 |
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
260 auction for merging merge bids |
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
261 f1: picking 'get' action |
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
262 f2: picking 'keep' action |
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
263 end of auction |
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
264 |
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
265 f1: remote is newer -> g |
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
266 getting f1 |
23482
208ec8ca7c79
merge: make 'keep' message more descriptive
Martin von Zweigbergk <martinvonz@google.com>
parents:
22673
diff
changeset
|
267 f2: remote unchanged -> k |
42154
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
268 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
21128
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
269 (branch merge, don't forget to commit) |
f4014f646f71
merge: with merge.preferancestor=*, run an auction with bids from ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
21126
diff
changeset
|
270 |
38625
52f19a840543
revset: add optimization for heads(commonancestors())
Sean Farley <sean@farley.io>
parents:
35704
diff
changeset
|
271 Test the greatest common ancestor returning multiple changesets |
52f19a840543
revset: add optimization for heads(commonancestors())
Sean Farley <sean@farley.io>
parents:
35704
diff
changeset
|
272 |
52f19a840543
revset: add optimization for heads(commonancestors())
Sean Farley <sean@farley.io>
parents:
35704
diff
changeset
|
273 $ hg log -r 'heads(commonancestors(head()))' |
52f19a840543
revset: add optimization for heads(commonancestors())
Sean Farley <sean@farley.io>
parents:
35704
diff
changeset
|
274 changeset: 1:0f6b37dbe527 |
52f19a840543
revset: add optimization for heads(commonancestors())
Sean Farley <sean@farley.io>
parents:
35704
diff
changeset
|
275 user: test |
52f19a840543
revset: add optimization for heads(commonancestors())
Sean Farley <sean@farley.io>
parents:
35704
diff
changeset
|
276 date: Thu Jan 01 00:00:00 1970 +0000 |
52f19a840543
revset: add optimization for heads(commonancestors())
Sean Farley <sean@farley.io>
parents:
35704
diff
changeset
|
277 summary: 1 first change f1 |
52f19a840543
revset: add optimization for heads(commonancestors())
Sean Farley <sean@farley.io>
parents:
35704
diff
changeset
|
278 |
42154
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
279 changeset: 2:40663881a6dd |
38625
52f19a840543
revset: add optimization for heads(commonancestors())
Sean Farley <sean@farley.io>
parents:
35704
diff
changeset
|
280 parent: 0:40494bf2444c |
52f19a840543
revset: add optimization for heads(commonancestors())
Sean Farley <sean@farley.io>
parents:
35704
diff
changeset
|
281 user: test |
52f19a840543
revset: add optimization for heads(commonancestors())
Sean Farley <sean@farley.io>
parents:
35704
diff
changeset
|
282 date: Thu Jan 01 00:00:00 1970 +0000 |
52f19a840543
revset: add optimization for heads(commonancestors())
Sean Farley <sean@farley.io>
parents:
35704
diff
changeset
|
283 summary: 2 first change f2 |
52f19a840543
revset: add optimization for heads(commonancestors())
Sean Farley <sean@farley.io>
parents:
35704
diff
changeset
|
284 |
52f19a840543
revset: add optimization for heads(commonancestors())
Sean Farley <sean@farley.io>
parents:
35704
diff
changeset
|
285 |
20636
12580e04cc43
tests: add test case for criss cross merge
Mads Kiilerich <madski@unity3d.com>
parents:
diff
changeset
|
286 $ cd .. |
21169
b743077db69a
tests: better test coverage for bid merge
Mads Kiilerich <madski@unity3d.com>
parents:
21128
diff
changeset
|
287 |
b743077db69a
tests: better test coverage for bid merge
Mads Kiilerich <madski@unity3d.com>
parents:
21128
diff
changeset
|
288 http://stackoverflow.com/questions/9350005/how-do-i-specify-a-merge-base-to-use-in-a-hg-merge/9430810 |
b743077db69a
tests: better test coverage for bid merge
Mads Kiilerich <madski@unity3d.com>
parents:
21128
diff
changeset
|
289 |
b743077db69a
tests: better test coverage for bid merge
Mads Kiilerich <madski@unity3d.com>
parents:
21128
diff
changeset
|
290 $ hg init ancestor-merging |
b743077db69a
tests: better test coverage for bid merge
Mads Kiilerich <madski@unity3d.com>
parents:
21128
diff
changeset
|
291 $ cd ancestor-merging |
b743077db69a
tests: better test coverage for bid merge
Mads Kiilerich <madski@unity3d.com>
parents:
21128
diff
changeset
|
292 $ echo a > x |
b743077db69a
tests: better test coverage for bid merge
Mads Kiilerich <madski@unity3d.com>
parents:
21128
diff
changeset
|
293 $ hg commit -A -m a x |
b743077db69a
tests: better test coverage for bid merge
Mads Kiilerich <madski@unity3d.com>
parents:
21128
diff
changeset
|
294 $ hg update -q 0 |
b743077db69a
tests: better test coverage for bid merge
Mads Kiilerich <madski@unity3d.com>
parents:
21128
diff
changeset
|
295 $ echo b >> x |
b743077db69a
tests: better test coverage for bid merge
Mads Kiilerich <madski@unity3d.com>
parents:
21128
diff
changeset
|
296 $ hg commit -m b |
b743077db69a
tests: better test coverage for bid merge
Mads Kiilerich <madski@unity3d.com>
parents:
21128
diff
changeset
|
297 $ hg update -q 0 |
b743077db69a
tests: better test coverage for bid merge
Mads Kiilerich <madski@unity3d.com>
parents:
21128
diff
changeset
|
298 $ echo c >> x |
b743077db69a
tests: better test coverage for bid merge
Mads Kiilerich <madski@unity3d.com>
parents:
21128
diff
changeset
|
299 $ hg commit -qm c |
b743077db69a
tests: better test coverage for bid merge
Mads Kiilerich <madski@unity3d.com>
parents:
21128
diff
changeset
|
300 $ hg update -q 1 |
b743077db69a
tests: better test coverage for bid merge
Mads Kiilerich <madski@unity3d.com>
parents:
21128
diff
changeset
|
301 $ hg merge -q --tool internal:local 2 |
b743077db69a
tests: better test coverage for bid merge
Mads Kiilerich <madski@unity3d.com>
parents:
21128
diff
changeset
|
302 $ echo c >> x |
b743077db69a
tests: better test coverage for bid merge
Mads Kiilerich <madski@unity3d.com>
parents:
21128
diff
changeset
|
303 $ hg commit -m bc |
b743077db69a
tests: better test coverage for bid merge
Mads Kiilerich <madski@unity3d.com>
parents:
21128
diff
changeset
|
304 $ hg update -q 2 |
b743077db69a
tests: better test coverage for bid merge
Mads Kiilerich <madski@unity3d.com>
parents:
21128
diff
changeset
|
305 $ hg merge -q --tool internal:local 1 |
b743077db69a
tests: better test coverage for bid merge
Mads Kiilerich <madski@unity3d.com>
parents:
21128
diff
changeset
|
306 $ echo b >> x |
b743077db69a
tests: better test coverage for bid merge
Mads Kiilerich <madski@unity3d.com>
parents:
21128
diff
changeset
|
307 $ hg commit -qm cb |
b743077db69a
tests: better test coverage for bid merge
Mads Kiilerich <madski@unity3d.com>
parents:
21128
diff
changeset
|
308 |
22672
19903277f035
merge: use bid merge by default (BC)
Mads Kiilerich <madski@unity3d.com>
parents:
22671
diff
changeset
|
309 $ hg merge --config merge.preferancestor='!' |
21169
b743077db69a
tests: better test coverage for bid merge
Mads Kiilerich <madski@unity3d.com>
parents:
21128
diff
changeset
|
310 note: using 70008a2163f6 as ancestor of 0d355fdef312 and 4b8b546a3eef |
b743077db69a
tests: better test coverage for bid merge
Mads Kiilerich <madski@unity3d.com>
parents:
21128
diff
changeset
|
311 alternatively, use --config merge.preferancestor=b211bbc6eb3c |
b743077db69a
tests: better test coverage for bid merge
Mads Kiilerich <madski@unity3d.com>
parents:
21128
diff
changeset
|
312 merging x |
b743077db69a
tests: better test coverage for bid merge
Mads Kiilerich <madski@unity3d.com>
parents:
21128
diff
changeset
|
313 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
b743077db69a
tests: better test coverage for bid merge
Mads Kiilerich <madski@unity3d.com>
parents:
21128
diff
changeset
|
314 (branch merge, don't forget to commit) |
b743077db69a
tests: better test coverage for bid merge
Mads Kiilerich <madski@unity3d.com>
parents:
21128
diff
changeset
|
315 $ cat x |
b743077db69a
tests: better test coverage for bid merge
Mads Kiilerich <madski@unity3d.com>
parents:
21128
diff
changeset
|
316 a |
b743077db69a
tests: better test coverage for bid merge
Mads Kiilerich <madski@unity3d.com>
parents:
21128
diff
changeset
|
317 c |
b743077db69a
tests: better test coverage for bid merge
Mads Kiilerich <madski@unity3d.com>
parents:
21128
diff
changeset
|
318 b |
b743077db69a
tests: better test coverage for bid merge
Mads Kiilerich <madski@unity3d.com>
parents:
21128
diff
changeset
|
319 c |
b743077db69a
tests: better test coverage for bid merge
Mads Kiilerich <madski@unity3d.com>
parents:
21128
diff
changeset
|
320 |
b743077db69a
tests: better test coverage for bid merge
Mads Kiilerich <madski@unity3d.com>
parents:
21128
diff
changeset
|
321 $ hg up -qC . |
b743077db69a
tests: better test coverage for bid merge
Mads Kiilerich <madski@unity3d.com>
parents:
21128
diff
changeset
|
322 |
b743077db69a
tests: better test coverage for bid merge
Mads Kiilerich <madski@unity3d.com>
parents:
21128
diff
changeset
|
323 $ hg merge --config merge.preferancestor=b211bbc6eb3c |
b743077db69a
tests: better test coverage for bid merge
Mads Kiilerich <madski@unity3d.com>
parents:
21128
diff
changeset
|
324 note: using b211bbc6eb3c as ancestor of 0d355fdef312 and 4b8b546a3eef |
b743077db69a
tests: better test coverage for bid merge
Mads Kiilerich <madski@unity3d.com>
parents:
21128
diff
changeset
|
325 alternatively, use --config merge.preferancestor=70008a2163f6 |
b743077db69a
tests: better test coverage for bid merge
Mads Kiilerich <madski@unity3d.com>
parents:
21128
diff
changeset
|
326 merging x |
b743077db69a
tests: better test coverage for bid merge
Mads Kiilerich <madski@unity3d.com>
parents:
21128
diff
changeset
|
327 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
b743077db69a
tests: better test coverage for bid merge
Mads Kiilerich <madski@unity3d.com>
parents:
21128
diff
changeset
|
328 (branch merge, don't forget to commit) |
b743077db69a
tests: better test coverage for bid merge
Mads Kiilerich <madski@unity3d.com>
parents:
21128
diff
changeset
|
329 $ cat x |
b743077db69a
tests: better test coverage for bid merge
Mads Kiilerich <madski@unity3d.com>
parents:
21128
diff
changeset
|
330 a |
b743077db69a
tests: better test coverage for bid merge
Mads Kiilerich <madski@unity3d.com>
parents:
21128
diff
changeset
|
331 b |
b743077db69a
tests: better test coverage for bid merge
Mads Kiilerich <madski@unity3d.com>
parents:
21128
diff
changeset
|
332 c |
b743077db69a
tests: better test coverage for bid merge
Mads Kiilerich <madski@unity3d.com>
parents:
21128
diff
changeset
|
333 b |
b743077db69a
tests: better test coverage for bid merge
Mads Kiilerich <madski@unity3d.com>
parents:
21128
diff
changeset
|
334 |
b743077db69a
tests: better test coverage for bid merge
Mads Kiilerich <madski@unity3d.com>
parents:
21128
diff
changeset
|
335 $ hg up -qC . |
b743077db69a
tests: better test coverage for bid merge
Mads Kiilerich <madski@unity3d.com>
parents:
21128
diff
changeset
|
336 |
b743077db69a
tests: better test coverage for bid merge
Mads Kiilerich <madski@unity3d.com>
parents:
21128
diff
changeset
|
337 $ hg merge -v --config merge.preferancestor="*" |
21171
33737ebc6f39
merge: tell the user when we are using bid merge
Mads Kiilerich <madski@unity3d.com>
parents:
21170
diff
changeset
|
338 note: merging 0d355fdef312+ and 4b8b546a3eef using bids from ancestors 70008a2163f6 and b211bbc6eb3c |
21169
b743077db69a
tests: better test coverage for bid merge
Mads Kiilerich <madski@unity3d.com>
parents:
21128
diff
changeset
|
339 |
b743077db69a
tests: better test coverage for bid merge
Mads Kiilerich <madski@unity3d.com>
parents:
21128
diff
changeset
|
340 calculating bids for ancestor 70008a2163f6 |
b743077db69a
tests: better test coverage for bid merge
Mads Kiilerich <madski@unity3d.com>
parents:
21128
diff
changeset
|
341 resolving manifests |
b743077db69a
tests: better test coverage for bid merge
Mads Kiilerich <madski@unity3d.com>
parents:
21128
diff
changeset
|
342 |
b743077db69a
tests: better test coverage for bid merge
Mads Kiilerich <madski@unity3d.com>
parents:
21128
diff
changeset
|
343 calculating bids for ancestor b211bbc6eb3c |
b743077db69a
tests: better test coverage for bid merge
Mads Kiilerich <madski@unity3d.com>
parents:
21128
diff
changeset
|
344 resolving manifests |
b743077db69a
tests: better test coverage for bid merge
Mads Kiilerich <madski@unity3d.com>
parents:
21128
diff
changeset
|
345 |
b743077db69a
tests: better test coverage for bid merge
Mads Kiilerich <madski@unity3d.com>
parents:
21128
diff
changeset
|
346 auction for merging merge bids |
21172
0f0059af920c
merge: improve notes for listing the bids for ambiguous merges
Mads Kiilerich <madski@unity3d.com>
parents:
21171
diff
changeset
|
347 x: multiple bids for merge action: |
0f0059af920c
merge: improve notes for listing the bids for ambiguous merges
Mads Kiilerich <madski@unity3d.com>
parents:
21171
diff
changeset
|
348 versions differ -> m |
0f0059af920c
merge: improve notes for listing the bids for ambiguous merges
Mads Kiilerich <madski@unity3d.com>
parents:
21171
diff
changeset
|
349 versions differ -> m |
21170
ea3972243320
merge: fix stray character in bid merge message
Mads Kiilerich <madski@unity3d.com>
parents:
21169
diff
changeset
|
350 x: ambiguous merge - picked m action |
21169
b743077db69a
tests: better test coverage for bid merge
Mads Kiilerich <madski@unity3d.com>
parents:
21128
diff
changeset
|
351 end of auction |
b743077db69a
tests: better test coverage for bid merge
Mads Kiilerich <madski@unity3d.com>
parents:
21128
diff
changeset
|
352 |
b743077db69a
tests: better test coverage for bid merge
Mads Kiilerich <madski@unity3d.com>
parents:
21128
diff
changeset
|
353 merging x |
b743077db69a
tests: better test coverage for bid merge
Mads Kiilerich <madski@unity3d.com>
parents:
21128
diff
changeset
|
354 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
b743077db69a
tests: better test coverage for bid merge
Mads Kiilerich <madski@unity3d.com>
parents:
21128
diff
changeset
|
355 (branch merge, don't forget to commit) |
b743077db69a
tests: better test coverage for bid merge
Mads Kiilerich <madski@unity3d.com>
parents:
21128
diff
changeset
|
356 $ cat x |
b743077db69a
tests: better test coverage for bid merge
Mads Kiilerich <madski@unity3d.com>
parents:
21128
diff
changeset
|
357 a |
b743077db69a
tests: better test coverage for bid merge
Mads Kiilerich <madski@unity3d.com>
parents:
21128
diff
changeset
|
358 c |
b743077db69a
tests: better test coverage for bid merge
Mads Kiilerich <madski@unity3d.com>
parents:
21128
diff
changeset
|
359 b |
b743077db69a
tests: better test coverage for bid merge
Mads Kiilerich <madski@unity3d.com>
parents:
21128
diff
changeset
|
360 c |
b743077db69a
tests: better test coverage for bid merge
Mads Kiilerich <madski@unity3d.com>
parents:
21128
diff
changeset
|
361 |
22180
17011b36aac7
changectx: ancestor should only prefer merge.preferancestor if it is a revision
Mads Kiilerich <madski@unity3d.com>
parents:
22179
diff
changeset
|
362 Verify that the old context ancestor works with / despite preferancestor: |
17011b36aac7
changectx: ancestor should only prefer merge.preferancestor if it is a revision
Mads Kiilerich <madski@unity3d.com>
parents:
22179
diff
changeset
|
363 |
17011b36aac7
changectx: ancestor should only prefer merge.preferancestor if it is a revision
Mads Kiilerich <madski@unity3d.com>
parents:
22179
diff
changeset
|
364 $ hg log -r 'ancestor(head())' --config merge.preferancestor=1 -T '{rev}\n' |
17011b36aac7
changectx: ancestor should only prefer merge.preferancestor if it is a revision
Mads Kiilerich <madski@unity3d.com>
parents:
22179
diff
changeset
|
365 1 |
17011b36aac7
changectx: ancestor should only prefer merge.preferancestor if it is a revision
Mads Kiilerich <madski@unity3d.com>
parents:
22179
diff
changeset
|
366 $ hg log -r 'ancestor(head())' --config merge.preferancestor=2 -T '{rev}\n' |
17011b36aac7
changectx: ancestor should only prefer merge.preferancestor if it is a revision
Mads Kiilerich <madski@unity3d.com>
parents:
22179
diff
changeset
|
367 2 |
17011b36aac7
changectx: ancestor should only prefer merge.preferancestor if it is a revision
Mads Kiilerich <madski@unity3d.com>
parents:
22179
diff
changeset
|
368 $ hg log -r 'ancestor(head())' --config merge.preferancestor=3 -T '{rev}\n' |
17011b36aac7
changectx: ancestor should only prefer merge.preferancestor if it is a revision
Mads Kiilerich <madski@unity3d.com>
parents:
22179
diff
changeset
|
369 1 |
22671
5220c12c43fd
changectx: skip all invalid merge.preferancestor values
Mads Kiilerich <madski@unity3d.com>
parents:
22180
diff
changeset
|
370 $ hg log -r 'ancestor(head())' --config merge.preferancestor='1337 * - 2' -T '{rev}\n' |
5220c12c43fd
changectx: skip all invalid merge.preferancestor values
Mads Kiilerich <madski@unity3d.com>
parents:
22180
diff
changeset
|
371 2 |
22180
17011b36aac7
changectx: ancestor should only prefer merge.preferancestor if it is a revision
Mads Kiilerich <madski@unity3d.com>
parents:
22179
diff
changeset
|
372 |
21169
b743077db69a
tests: better test coverage for bid merge
Mads Kiilerich <madski@unity3d.com>
parents:
21128
diff
changeset
|
373 $ cd .. |
42154
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
374 |
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
375 $ hg init issue5020 |
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
376 $ cd issue5020 |
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
377 |
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
378 $ echo a > noop |
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
379 $ hg ci -qAm initial |
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
380 |
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
381 $ echo b > noop |
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
382 $ hg ci -qAm 'uninteresting change' |
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
383 |
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
384 $ hg up -q 0 |
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
385 $ mkdir d1 |
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
386 $ echo a > d1/a |
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
387 $ echo b > d1/b |
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
388 $ hg ci -qAm 'add d1/a and d1/b' |
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
389 |
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
390 $ hg merge -q 1 |
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
391 $ hg rm d1/a |
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
392 $ hg mv -q d1 d2 |
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
393 $ hg ci -qm 'merge while removing d1/a and moving d1/b to d2/b' |
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
394 |
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
395 $ hg up -q 1 |
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
396 $ hg merge -q 2 |
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
397 $ hg ci -qm 'merge (no changes while merging)' |
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
398 $ hg log -G -T '{rev}:{node|short} {desc}' |
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
399 @ 4:c0ef19750a22 merge (no changes while merging) |
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
400 |\ |
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
401 +---o 3:6ca01f7342b9 merge while removing d1/a and moving d1/b to d2/b |
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
402 | |/ |
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
403 | o 2:154e6000f54e add d1/a and d1/b |
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
404 | | |
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
405 o | 1:11b5b303e36c uninteresting change |
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
406 |/ |
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
407 o 0:7b54db1ebf33 initial |
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
408 |
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
409 $ hg merge 3 --debug |
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
410 note: merging c0ef19750a22+ and 6ca01f7342b9 using bids from ancestors 11b5b303e36c and 154e6000f54e |
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
411 |
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
412 calculating bids for ancestor 11b5b303e36c |
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
413 resolving manifests |
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
414 branchmerge: True, force: False, partial: False |
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
415 ancestor: 11b5b303e36c, local: c0ef19750a22+, remote: 6ca01f7342b9 |
42162
31abb9d713af
copies: don't include copies that are not in source in directory move
Martin von Zweigbergk <martinvonz@google.com>
parents:
42154
diff
changeset
|
416 d2/b: remote created -> g |
42154
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
417 |
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
418 calculating bids for ancestor 154e6000f54e |
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
419 unmatched files in other: |
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
420 d2/b |
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
421 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
44197
17e12938f8e7
copies: print debug information about copies per side/branch
Martin von Zweigbergk <martinvonz@google.com>
parents:
44162
diff
changeset
|
422 on remote side: |
17e12938f8e7
copies: print debug information about copies per side/branch
Martin von Zweigbergk <martinvonz@google.com>
parents:
44162
diff
changeset
|
423 src: 'd1/b' -> dst: 'd2/b' |
42154
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
424 checking for directory renames |
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
425 discovered dir src: 'd1/' -> dst: 'd2/' |
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
426 resolving manifests |
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
427 branchmerge: True, force: False, partial: False |
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
428 ancestor: 154e6000f54e, local: c0ef19750a22+, remote: 6ca01f7342b9 |
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
429 d1/a: other deleted -> r |
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
430 d1/b: other deleted -> r |
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
431 d2/b: remote created -> g |
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
432 |
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
433 auction for merging merge bids |
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
434 d1/a: consensus for r |
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
435 d1/b: consensus for r |
42162
31abb9d713af
copies: don't include copies that are not in source in directory move
Martin von Zweigbergk <martinvonz@google.com>
parents:
42154
diff
changeset
|
436 d2/b: consensus for g |
42154
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
437 end of auction |
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
438 |
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
439 d1/a: other deleted -> r |
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
440 removing d1/a |
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
441 d1/b: other deleted -> r |
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
442 removing d1/b |
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
443 d2/b: remote created -> g |
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
444 getting d2/b |
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
445 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
f2fe7cf4ebb6
tests: split out separate test for issue5020
Martin von Zweigbergk <martinvonz@google.com>
parents:
38625
diff
changeset
|
446 (branch merge, don't forget to commit) |