Mercurial > hg
annotate tests/test-rename-merge2.out @ 10490:f2618cacb485 stable
filelog: sort meta entries, ensure deterministic order
author | Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de> |
---|---|
date | Tue, 16 Feb 2010 21:04:04 +0100 |
parents | ba5e508b5e92 |
children | db426935fa94 |
rev | line source |
---|---|
6336
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6004
diff
changeset
|
1 created new head |
3252 | 2 -------------- |
3 test L:up a R:nc a b W: - 1 get local a to b | |
4 -------------- | |
5387
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
5 searching for copies back to rev 1 |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
6 unmatched files in other: |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
7 b |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
8 all copies found (* = to merge, ! = divergent): |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
9 b -> a * |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
10 checking for directory renames |
8753
af5f099d932b
merge: refactor manifestmerge init to better report effective ancestor
Matt Mackall <mpm@selenic.com>
parents:
8748
diff
changeset
|
11 resolving manifests |
af5f099d932b
merge: refactor manifestmerge init to better report effective ancestor
Matt Mackall <mpm@selenic.com>
parents:
8748
diff
changeset
|
12 overwrite None partial False |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10431
diff
changeset
|
13 ancestor 924404dff337 local e300d1c794ec+ remote 4ce40f5aca24 |
3252 | 14 rev: versions differ -> m |
3727
0fb66912040a
merge: report destinations of moves in merge action messages
Matt Mackall <mpm@selenic.com>
parents:
3674
diff
changeset
|
15 a: remote copied to b -> m |
6512
368a4ec603cc
merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
16 preserving a for resolve of b |
368a4ec603cc
merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
17 preserving rev for resolve of rev |
10431
ba5e508b5e92
update: make calls to ui.progress()
Augie Fackler <durin42@gmail.com>
parents:
8753
diff
changeset
|
18 update: a 1/2 files (50.00%) |
6512
368a4ec603cc
merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
19 picked tool 'python ../merge' for b (binary False symlink False) |
368a4ec603cc
merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
20 merging a and b to b |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10431
diff
changeset
|
21 my b@e300d1c794ec+ other b@4ce40f5aca24 ancestor a@924404dff337 |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
22 premerge successful |
10431
ba5e508b5e92
update: make calls to ui.progress()
Augie Fackler <durin42@gmail.com>
parents:
8753
diff
changeset
|
23 update: rev 2/2 files (100.00%) |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
24 picked tool 'python ../merge' for rev (binary False symlink False) |
3252 | 25 merging rev |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10431
diff
changeset
|
26 my rev@e300d1c794ec+ other rev@4ce40f5aca24 ancestor rev@924404dff337 |
3252 | 27 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
28 (branch merge, don't forget to commit) | |
29 -------------- | |
30 M b | |
31 a | |
5764
8a5d8fb59ed2
Backed out changeset c2a21fe60994
Matt Mackall <mpm@selenic.com>
parents:
5762
diff
changeset
|
32 C a |
3252 | 33 -------------- |
34 | |
6336
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6004
diff
changeset
|
35 created new head |
3252 | 36 -------------- |
37 test L:nc a b R:up a W: - 2 get rem change to a and b | |
38 -------------- | |
5387
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
39 searching for copies back to rev 1 |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
40 unmatched files in local: |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
41 b |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
42 all copies found (* = to merge, ! = divergent): |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
43 b -> a * |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
44 checking for directory renames |
8753
af5f099d932b
merge: refactor manifestmerge init to better report effective ancestor
Matt Mackall <mpm@selenic.com>
parents:
8748
diff
changeset
|
45 resolving manifests |
af5f099d932b
merge: refactor manifestmerge init to better report effective ancestor
Matt Mackall <mpm@selenic.com>
parents:
8748
diff
changeset
|
46 overwrite None partial False |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10431
diff
changeset
|
47 ancestor 924404dff337 local 86a2aa42fc76+ remote f4db7e329e71 |
3252 | 48 a: remote is newer -> g |
8748
f325574dad1a
merge: combine a copy and move case
Matt Mackall <mpm@selenic.com>
parents:
7768
diff
changeset
|
49 b: local copied/moved to a -> m |
3252 | 50 rev: versions differ -> m |
6512
368a4ec603cc
merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
51 preserving b for resolve of b |
368a4ec603cc
merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
52 preserving rev for resolve of rev |
10431
ba5e508b5e92
update: make calls to ui.progress()
Augie Fackler <durin42@gmail.com>
parents:
8753
diff
changeset
|
53 update: a 1/3 files (33.33%) |
3252 | 54 getting a |
10431
ba5e508b5e92
update: make calls to ui.progress()
Augie Fackler <durin42@gmail.com>
parents:
8753
diff
changeset
|
55 update: b 2/3 files (66.67%) |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
56 picked tool 'python ../merge' for b (binary False symlink False) |
6512
368a4ec603cc
merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
57 merging b and a to b |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10431
diff
changeset
|
58 my b@86a2aa42fc76+ other a@f4db7e329e71 ancestor a@924404dff337 |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
59 premerge successful |
10431
ba5e508b5e92
update: make calls to ui.progress()
Augie Fackler <durin42@gmail.com>
parents:
8753
diff
changeset
|
60 update: rev 3/3 files (100.00%) |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
61 picked tool 'python ../merge' for rev (binary False symlink False) |
3252 | 62 merging rev |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10431
diff
changeset
|
63 my rev@86a2aa42fc76+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
3252 | 64 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
65 (branch merge, don't forget to commit) | |
66 -------------- | |
67 M a | |
68 M b | |
3292
764688cf51e5
merge: remember rename copies and parents properly on commit
Matt Mackall <mpm@selenic.com>
parents:
3282
diff
changeset
|
69 a |
3252 | 70 -------------- |
71 | |
6336
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6004
diff
changeset
|
72 created new head |
3252 | 73 -------------- |
74 test L:up a R:nm a b W: - 3 get local a change to b, remove a | |
75 -------------- | |
5387
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
76 searching for copies back to rev 1 |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
77 unmatched files in other: |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
78 b |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
79 all copies found (* = to merge, ! = divergent): |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
80 b -> a * |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
81 checking for directory renames |
8753
af5f099d932b
merge: refactor manifestmerge init to better report effective ancestor
Matt Mackall <mpm@selenic.com>
parents:
8748
diff
changeset
|
82 resolving manifests |
af5f099d932b
merge: refactor manifestmerge init to better report effective ancestor
Matt Mackall <mpm@selenic.com>
parents:
8748
diff
changeset
|
83 overwrite None partial False |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10431
diff
changeset
|
84 ancestor 924404dff337 local e300d1c794ec+ remote bdb19105162a |
3730
d377f8d25662
merge: only store one direction of copies in the copy map
Matt Mackall <mpm@selenic.com>
parents:
3727
diff
changeset
|
85 rev: versions differ -> m |
3727
0fb66912040a
merge: report destinations of moves in merge action messages
Matt Mackall <mpm@selenic.com>
parents:
3674
diff
changeset
|
86 a: remote moved to b -> m |
6512
368a4ec603cc
merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
87 preserving a for resolve of b |
368a4ec603cc
merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
88 preserving rev for resolve of rev |
368a4ec603cc
merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
89 removing a |
10431
ba5e508b5e92
update: make calls to ui.progress()
Augie Fackler <durin42@gmail.com>
parents:
8753
diff
changeset
|
90 update: a 1/2 files (50.00%) |
6512
368a4ec603cc
merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
91 picked tool 'python ../merge' for b (binary False symlink False) |
368a4ec603cc
merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
92 merging a and b to b |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10431
diff
changeset
|
93 my b@e300d1c794ec+ other b@bdb19105162a ancestor a@924404dff337 |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
94 premerge successful |
10431
ba5e508b5e92
update: make calls to ui.progress()
Augie Fackler <durin42@gmail.com>
parents:
8753
diff
changeset
|
95 update: rev 2/2 files (100.00%) |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
96 picked tool 'python ../merge' for rev (binary False symlink False) |
3252 | 97 merging rev |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10431
diff
changeset
|
98 my rev@e300d1c794ec+ other rev@bdb19105162a ancestor rev@924404dff337 |
3252 | 99 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
100 (branch merge, don't forget to commit) | |
101 -------------- | |
102 M b | |
103 a | |
104 -------------- | |
105 | |
6336
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6004
diff
changeset
|
106 created new head |
3252 | 107 -------------- |
108 test L:nm a b R:up a W: - 4 get remote change to b | |
109 -------------- | |
5387
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
110 searching for copies back to rev 1 |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
111 unmatched files in local: |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
112 b |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
113 all copies found (* = to merge, ! = divergent): |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
114 b -> a * |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
115 checking for directory renames |
8753
af5f099d932b
merge: refactor manifestmerge init to better report effective ancestor
Matt Mackall <mpm@selenic.com>
parents:
8748
diff
changeset
|
116 resolving manifests |
af5f099d932b
merge: refactor manifestmerge init to better report effective ancestor
Matt Mackall <mpm@selenic.com>
parents:
8748
diff
changeset
|
117 overwrite None partial False |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10431
diff
changeset
|
118 ancestor 924404dff337 local 02963e448370+ remote f4db7e329e71 |
8748
f325574dad1a
merge: combine a copy and move case
Matt Mackall <mpm@selenic.com>
parents:
7768
diff
changeset
|
119 b: local copied/moved to a -> m |
3252 | 120 rev: versions differ -> m |
6512
368a4ec603cc
merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
121 preserving b for resolve of b |
368a4ec603cc
merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
122 preserving rev for resolve of rev |
10431
ba5e508b5e92
update: make calls to ui.progress()
Augie Fackler <durin42@gmail.com>
parents:
8753
diff
changeset
|
123 update: b 1/2 files (50.00%) |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
124 picked tool 'python ../merge' for b (binary False symlink False) |
6512
368a4ec603cc
merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
125 merging b and a to b |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10431
diff
changeset
|
126 my b@02963e448370+ other a@f4db7e329e71 ancestor a@924404dff337 |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
127 premerge successful |
10431
ba5e508b5e92
update: make calls to ui.progress()
Augie Fackler <durin42@gmail.com>
parents:
8753
diff
changeset
|
128 update: rev 2/2 files (100.00%) |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
129 picked tool 'python ../merge' for rev (binary False symlink False) |
3252 | 130 merging rev |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10431
diff
changeset
|
131 my rev@02963e448370+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
3252 | 132 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
133 (branch merge, don't forget to commit) | |
134 -------------- | |
135 M b | |
3292
764688cf51e5
merge: remember rename copies and parents properly on commit
Matt Mackall <mpm@selenic.com>
parents:
3282
diff
changeset
|
136 a |
3252 | 137 -------------- |
138 | |
6336
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6004
diff
changeset
|
139 created new head |
3252 | 140 -------------- |
141 test L: R:nc a b W: - 5 get b | |
142 -------------- | |
5387
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
143 searching for copies back to rev 1 |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
144 unmatched files in other: |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
145 b |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
146 all copies found (* = to merge, ! = divergent): |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
147 b -> a |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
148 checking for directory renames |
8753
af5f099d932b
merge: refactor manifestmerge init to better report effective ancestor
Matt Mackall <mpm@selenic.com>
parents:
8748
diff
changeset
|
149 resolving manifests |
af5f099d932b
merge: refactor manifestmerge init to better report effective ancestor
Matt Mackall <mpm@selenic.com>
parents:
8748
diff
changeset
|
150 overwrite None partial False |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10431
diff
changeset
|
151 ancestor 924404dff337 local 94b33a1b7f2d+ remote 4ce40f5aca24 |
3252 | 152 rev: versions differ -> m |
4416
bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents:
4304
diff
changeset
|
153 b: remote created -> g |
6512
368a4ec603cc
merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
154 preserving rev for resolve of rev |
10431
ba5e508b5e92
update: make calls to ui.progress()
Augie Fackler <durin42@gmail.com>
parents:
8753
diff
changeset
|
155 update: b 1/2 files (50.00%) |
4416
bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents:
4304
diff
changeset
|
156 getting b |
10431
ba5e508b5e92
update: make calls to ui.progress()
Augie Fackler <durin42@gmail.com>
parents:
8753
diff
changeset
|
157 update: rev 2/2 files (100.00%) |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
158 picked tool 'python ../merge' for rev (binary False symlink False) |
3252 | 159 merging rev |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10431
diff
changeset
|
160 my rev@94b33a1b7f2d+ other rev@4ce40f5aca24 ancestor rev@924404dff337 |
3400
d2b55e3c4e25
merge: if filemerge skips merge, report as updated
Matt Mackall <mpm@selenic.com>
parents:
3314
diff
changeset
|
161 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
3252 | 162 (branch merge, don't forget to commit) |
163 -------------- | |
164 M b | |
5764
8a5d8fb59ed2
Backed out changeset c2a21fe60994
Matt Mackall <mpm@selenic.com>
parents:
5762
diff
changeset
|
165 C a |
3252 | 166 -------------- |
167 | |
6336
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6004
diff
changeset
|
168 created new head |
3252 | 169 -------------- |
170 test L:nc a b R: W: - 6 nothing | |
171 -------------- | |
5387
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
172 searching for copies back to rev 1 |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
173 unmatched files in local: |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
174 b |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
175 all copies found (* = to merge, ! = divergent): |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
176 b -> a |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
177 checking for directory renames |
8753
af5f099d932b
merge: refactor manifestmerge init to better report effective ancestor
Matt Mackall <mpm@selenic.com>
parents:
8748
diff
changeset
|
178 resolving manifests |
af5f099d932b
merge: refactor manifestmerge init to better report effective ancestor
Matt Mackall <mpm@selenic.com>
parents:
8748
diff
changeset
|
179 overwrite None partial False |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10431
diff
changeset
|
180 ancestor 924404dff337 local 86a2aa42fc76+ remote 97c705ade336 |
3252 | 181 rev: versions differ -> m |
6512
368a4ec603cc
merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
182 preserving rev for resolve of rev |
10431
ba5e508b5e92
update: make calls to ui.progress()
Augie Fackler <durin42@gmail.com>
parents:
8753
diff
changeset
|
183 update: rev 1/1 files (100.00%) |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
184 picked tool 'python ../merge' for rev (binary False symlink False) |
3252 | 185 merging rev |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10431
diff
changeset
|
186 my rev@86a2aa42fc76+ other rev@97c705ade336 ancestor rev@924404dff337 |
4416
bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents:
4304
diff
changeset
|
187 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
3252 | 188 (branch merge, don't forget to commit) |
189 -------------- | |
5764
8a5d8fb59ed2
Backed out changeset c2a21fe60994
Matt Mackall <mpm@selenic.com>
parents:
5762
diff
changeset
|
190 C a |
8a5d8fb59ed2
Backed out changeset c2a21fe60994
Matt Mackall <mpm@selenic.com>
parents:
5762
diff
changeset
|
191 C b |
3252 | 192 -------------- |
193 | |
6336
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6004
diff
changeset
|
194 created new head |
3252 | 195 -------------- |
196 test L: R:nm a b W: - 7 get b | |
197 -------------- | |
5387
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
198 searching for copies back to rev 1 |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
199 unmatched files in other: |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
200 b |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
201 all copies found (* = to merge, ! = divergent): |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
202 b -> a |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
203 checking for directory renames |
8753
af5f099d932b
merge: refactor manifestmerge init to better report effective ancestor
Matt Mackall <mpm@selenic.com>
parents:
8748
diff
changeset
|
204 resolving manifests |
af5f099d932b
merge: refactor manifestmerge init to better report effective ancestor
Matt Mackall <mpm@selenic.com>
parents:
8748
diff
changeset
|
205 overwrite None partial False |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10431
diff
changeset
|
206 ancestor 924404dff337 local 94b33a1b7f2d+ remote bdb19105162a |
4416
bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents:
4304
diff
changeset
|
207 a: other deleted -> r |
3252 | 208 rev: versions differ -> m |
4416
bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents:
4304
diff
changeset
|
209 b: remote created -> g |
6512
368a4ec603cc
merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
210 preserving rev for resolve of rev |
10431
ba5e508b5e92
update: make calls to ui.progress()
Augie Fackler <durin42@gmail.com>
parents:
8753
diff
changeset
|
211 update: a 1/3 files (33.33%) |
3252 | 212 removing a |
10431
ba5e508b5e92
update: make calls to ui.progress()
Augie Fackler <durin42@gmail.com>
parents:
8753
diff
changeset
|
213 update: b 2/3 files (66.67%) |
4416
bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents:
4304
diff
changeset
|
214 getting b |
10431
ba5e508b5e92
update: make calls to ui.progress()
Augie Fackler <durin42@gmail.com>
parents:
8753
diff
changeset
|
215 update: rev 3/3 files (100.00%) |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
216 picked tool 'python ../merge' for rev (binary False symlink False) |
3252 | 217 merging rev |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10431
diff
changeset
|
218 my rev@94b33a1b7f2d+ other rev@bdb19105162a ancestor rev@924404dff337 |
4416
bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents:
4304
diff
changeset
|
219 1 files updated, 1 files merged, 1 files removed, 0 files unresolved |
3252 | 220 (branch merge, don't forget to commit) |
221 -------------- | |
222 M b | |
223 -------------- | |
224 | |
6336
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6004
diff
changeset
|
225 created new head |
3252 | 226 -------------- |
227 test L:nm a b R: W: - 8 nothing | |
228 -------------- | |
5387
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
229 searching for copies back to rev 1 |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
230 unmatched files in local: |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
231 b |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
232 all copies found (* = to merge, ! = divergent): |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
233 b -> a |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
234 checking for directory renames |
8753
af5f099d932b
merge: refactor manifestmerge init to better report effective ancestor
Matt Mackall <mpm@selenic.com>
parents:
8748
diff
changeset
|
235 resolving manifests |
af5f099d932b
merge: refactor manifestmerge init to better report effective ancestor
Matt Mackall <mpm@selenic.com>
parents:
8748
diff
changeset
|
236 overwrite None partial False |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10431
diff
changeset
|
237 ancestor 924404dff337 local 02963e448370+ remote 97c705ade336 |
3252 | 238 rev: versions differ -> m |
6512
368a4ec603cc
merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
239 preserving rev for resolve of rev |
10431
ba5e508b5e92
update: make calls to ui.progress()
Augie Fackler <durin42@gmail.com>
parents:
8753
diff
changeset
|
240 update: rev 1/1 files (100.00%) |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
241 picked tool 'python ../merge' for rev (binary False symlink False) |
3252 | 242 merging rev |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10431
diff
changeset
|
243 my rev@02963e448370+ other rev@97c705ade336 ancestor rev@924404dff337 |
4416
bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents:
4304
diff
changeset
|
244 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
3252 | 245 (branch merge, don't forget to commit) |
246 -------------- | |
5764
8a5d8fb59ed2
Backed out changeset c2a21fe60994
Matt Mackall <mpm@selenic.com>
parents:
5762
diff
changeset
|
247 C b |
3252 | 248 -------------- |
249 | |
6336
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6004
diff
changeset
|
250 created new head |
3252 | 251 -------------- |
252 test L:um a b R:um a b W: - 9 do merge with ancestor in a | |
253 -------------- | |
8753
af5f099d932b
merge: refactor manifestmerge init to better report effective ancestor
Matt Mackall <mpm@selenic.com>
parents:
8748
diff
changeset
|
254 searching for copies back to rev 1 |
3252 | 255 resolving manifests |
3314 | 256 overwrite None partial False |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10431
diff
changeset
|
257 ancestor 924404dff337 local 62e7bf090eba+ remote 49b6d8032493 |
3252 | 258 b: versions differ -> m |
259 rev: versions differ -> m | |
6512
368a4ec603cc
merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
260 preserving b for resolve of b |
368a4ec603cc
merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
261 preserving rev for resolve of rev |
10431
ba5e508b5e92
update: make calls to ui.progress()
Augie Fackler <durin42@gmail.com>
parents:
8753
diff
changeset
|
262 update: b 1/2 files (50.00%) |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
263 picked tool 'python ../merge' for b (binary False symlink False) |
3252 | 264 merging b |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10431
diff
changeset
|
265 my b@62e7bf090eba+ other b@49b6d8032493 ancestor a@924404dff337 |
10431
ba5e508b5e92
update: make calls to ui.progress()
Augie Fackler <durin42@gmail.com>
parents:
8753
diff
changeset
|
266 update: rev 2/2 files (100.00%) |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
267 picked tool 'python ../merge' for rev (binary False symlink False) |
3252 | 268 merging rev |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10431
diff
changeset
|
269 my rev@62e7bf090eba+ other rev@49b6d8032493 ancestor rev@924404dff337 |
3252 | 270 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
271 (branch merge, don't forget to commit) | |
272 -------------- | |
273 M b | |
274 -------------- | |
275 | |
6336
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6004
diff
changeset
|
276 created new head |
3252 | 277 -------------- |
278 test L:nm a b R:nm a c W: - 11 get c, keep b | |
279 -------------- | |
5387
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
280 searching for copies back to rev 1 |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
281 unmatched files in local: |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
282 b |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
283 unmatched files in other: |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
284 c |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
285 all copies found (* = to merge, ! = divergent): |
5857
c704b03884ef
merge: add a bit more sanity to divergent copy checks
Matt Mackall <mpm@selenic.com>
parents:
5764
diff
changeset
|
286 c -> a ! |
c704b03884ef
merge: add a bit more sanity to divergent copy checks
Matt Mackall <mpm@selenic.com>
parents:
5764
diff
changeset
|
287 b -> a ! |
5387
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
288 checking for directory renames |
4674
723e0ddb6ada
merge: warn user about divergent renames
Matt Mackall <mpm@selenic.com>
parents:
4416
diff
changeset
|
289 a: divergent renames -> dr |
8753
af5f099d932b
merge: refactor manifestmerge init to better report effective ancestor
Matt Mackall <mpm@selenic.com>
parents:
8748
diff
changeset
|
290 resolving manifests |
af5f099d932b
merge: refactor manifestmerge init to better report effective ancestor
Matt Mackall <mpm@selenic.com>
parents:
8748
diff
changeset
|
291 overwrite None partial False |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10431
diff
changeset
|
292 ancestor 924404dff337 local 02963e448370+ remote fe905ef2c33e |
3252 | 293 rev: versions differ -> m |
294 c: remote created -> g | |
6512
368a4ec603cc
merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
295 preserving rev for resolve of rev |
10431
ba5e508b5e92
update: make calls to ui.progress()
Augie Fackler <durin42@gmail.com>
parents:
8753
diff
changeset
|
296 update: a 1/3 files (33.33%) |
4674
723e0ddb6ada
merge: warn user about divergent renames
Matt Mackall <mpm@selenic.com>
parents:
4416
diff
changeset
|
297 warning: detected divergent renames of a to: |
723e0ddb6ada
merge: warn user about divergent renames
Matt Mackall <mpm@selenic.com>
parents:
4416
diff
changeset
|
298 b |
723e0ddb6ada
merge: warn user about divergent renames
Matt Mackall <mpm@selenic.com>
parents:
4416
diff
changeset
|
299 c |
10431
ba5e508b5e92
update: make calls to ui.progress()
Augie Fackler <durin42@gmail.com>
parents:
8753
diff
changeset
|
300 update: c 2/3 files (66.67%) |
3252 | 301 getting c |
10431
ba5e508b5e92
update: make calls to ui.progress()
Augie Fackler <durin42@gmail.com>
parents:
8753
diff
changeset
|
302 update: rev 3/3 files (100.00%) |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
303 picked tool 'python ../merge' for rev (binary False symlink False) |
3252 | 304 merging rev |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10431
diff
changeset
|
305 my rev@02963e448370+ other rev@fe905ef2c33e ancestor rev@924404dff337 |
3252 | 306 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
307 (branch merge, don't forget to commit) | |
308 -------------- | |
309 M c | |
5764
8a5d8fb59ed2
Backed out changeset c2a21fe60994
Matt Mackall <mpm@selenic.com>
parents:
5762
diff
changeset
|
310 C b |
3252 | 311 -------------- |
312 | |
6336
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6004
diff
changeset
|
313 created new head |
3252 | 314 -------------- |
315 test L:nc a b R:up b W: - 12 merge b no ancestor | |
316 -------------- | |
8753
af5f099d932b
merge: refactor manifestmerge init to better report effective ancestor
Matt Mackall <mpm@selenic.com>
parents:
8748
diff
changeset
|
317 searching for copies back to rev 1 |
3252 | 318 resolving manifests |
3314 | 319 overwrite None partial False |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10431
diff
changeset
|
320 ancestor 924404dff337 local 86a2aa42fc76+ remote af30c7647fc7 |
3252 | 321 b: versions differ -> m |
322 rev: versions differ -> m | |
6512
368a4ec603cc
merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
323 preserving b for resolve of b |
368a4ec603cc
merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
324 preserving rev for resolve of rev |
10431
ba5e508b5e92
update: make calls to ui.progress()
Augie Fackler <durin42@gmail.com>
parents:
8753
diff
changeset
|
325 update: b 1/2 files (50.00%) |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
326 picked tool 'python ../merge' for b (binary False symlink False) |
3252 | 327 merging b |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10431
diff
changeset
|
328 my b@86a2aa42fc76+ other b@af30c7647fc7 ancestor b@000000000000 |
10431
ba5e508b5e92
update: make calls to ui.progress()
Augie Fackler <durin42@gmail.com>
parents:
8753
diff
changeset
|
329 update: rev 2/2 files (100.00%) |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
330 picked tool 'python ../merge' for rev (binary False symlink False) |
3252 | 331 merging rev |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10431
diff
changeset
|
332 my rev@86a2aa42fc76+ other rev@af30c7647fc7 ancestor rev@924404dff337 |
3252 | 333 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
334 (branch merge, don't forget to commit) | |
335 -------------- | |
336 M b | |
5764
8a5d8fb59ed2
Backed out changeset c2a21fe60994
Matt Mackall <mpm@selenic.com>
parents:
5762
diff
changeset
|
337 C a |
3252 | 338 -------------- |
339 | |
6336
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6004
diff
changeset
|
340 created new head |
3252 | 341 -------------- |
342 test L:up b R:nm a b W: - 13 merge b no ancestor | |
343 -------------- | |
8753
af5f099d932b
merge: refactor manifestmerge init to better report effective ancestor
Matt Mackall <mpm@selenic.com>
parents:
8748
diff
changeset
|
344 searching for copies back to rev 1 |
3252 | 345 resolving manifests |
3314 | 346 overwrite None partial False |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10431
diff
changeset
|
347 ancestor 924404dff337 local 59318016310c+ remote bdb19105162a |
3252 | 348 a: other deleted -> r |
349 b: versions differ -> m | |
350 rev: versions differ -> m | |
6512
368a4ec603cc
merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
351 preserving b for resolve of b |
368a4ec603cc
merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
352 preserving rev for resolve of rev |
10431
ba5e508b5e92
update: make calls to ui.progress()
Augie Fackler <durin42@gmail.com>
parents:
8753
diff
changeset
|
353 update: a 1/3 files (33.33%) |
3252 | 354 removing a |
10431
ba5e508b5e92
update: make calls to ui.progress()
Augie Fackler <durin42@gmail.com>
parents:
8753
diff
changeset
|
355 update: b 2/3 files (66.67%) |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
356 picked tool 'python ../merge' for b (binary False symlink False) |
3252 | 357 merging b |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10431
diff
changeset
|
358 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 |
10431
ba5e508b5e92
update: make calls to ui.progress()
Augie Fackler <durin42@gmail.com>
parents:
8753
diff
changeset
|
359 update: rev 3/3 files (100.00%) |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
360 picked tool 'python ../merge' for rev (binary False symlink False) |
3252 | 361 merging rev |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10431
diff
changeset
|
362 my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337 |
3252 | 363 0 files updated, 2 files merged, 1 files removed, 0 files unresolved |
364 (branch merge, don't forget to commit) | |
365 -------------- | |
366 M b | |
367 -------------- | |
368 | |
6336
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6004
diff
changeset
|
369 created new head |
3252 | 370 -------------- |
371 test L:nc a b R:up a b W: - 14 merge b no ancestor | |
372 -------------- | |
8753
af5f099d932b
merge: refactor manifestmerge init to better report effective ancestor
Matt Mackall <mpm@selenic.com>
parents:
8748
diff
changeset
|
373 searching for copies back to rev 1 |
3252 | 374 resolving manifests |
3314 | 375 overwrite None partial False |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10431
diff
changeset
|
376 ancestor 924404dff337 local 86a2aa42fc76+ remote 8dbce441892a |
3252 | 377 a: remote is newer -> g |
378 b: versions differ -> m | |
379 rev: versions differ -> m | |
6512
368a4ec603cc
merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
380 preserving b for resolve of b |
368a4ec603cc
merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
381 preserving rev for resolve of rev |
10431
ba5e508b5e92
update: make calls to ui.progress()
Augie Fackler <durin42@gmail.com>
parents:
8753
diff
changeset
|
382 update: a 1/3 files (33.33%) |
3252 | 383 getting a |
10431
ba5e508b5e92
update: make calls to ui.progress()
Augie Fackler <durin42@gmail.com>
parents:
8753
diff
changeset
|
384 update: b 2/3 files (66.67%) |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
385 picked tool 'python ../merge' for b (binary False symlink False) |
3252 | 386 merging b |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10431
diff
changeset
|
387 my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000 |
10431
ba5e508b5e92
update: make calls to ui.progress()
Augie Fackler <durin42@gmail.com>
parents:
8753
diff
changeset
|
388 update: rev 3/3 files (100.00%) |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
389 picked tool 'python ../merge' for rev (binary False symlink False) |
3252 | 390 merging rev |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10431
diff
changeset
|
391 my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337 |
3252 | 392 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
393 (branch merge, don't forget to commit) | |
394 -------------- | |
395 M a | |
396 M b | |
397 -------------- | |
398 | |
6336
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6004
diff
changeset
|
399 created new head |
3252 | 400 -------------- |
401 test L:up b R:nm a b W: - 15 merge b no ancestor, remove a | |
402 -------------- | |
8753
af5f099d932b
merge: refactor manifestmerge init to better report effective ancestor
Matt Mackall <mpm@selenic.com>
parents:
8748
diff
changeset
|
403 searching for copies back to rev 1 |
3252 | 404 resolving manifests |
3314 | 405 overwrite None partial False |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10431
diff
changeset
|
406 ancestor 924404dff337 local 59318016310c+ remote bdb19105162a |
3252 | 407 a: other deleted -> r |
408 b: versions differ -> m | |
409 rev: versions differ -> m | |
6512
368a4ec603cc
merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
410 preserving b for resolve of b |
368a4ec603cc
merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
411 preserving rev for resolve of rev |
10431
ba5e508b5e92
update: make calls to ui.progress()
Augie Fackler <durin42@gmail.com>
parents:
8753
diff
changeset
|
412 update: a 1/3 files (33.33%) |
3252 | 413 removing a |
10431
ba5e508b5e92
update: make calls to ui.progress()
Augie Fackler <durin42@gmail.com>
parents:
8753
diff
changeset
|
414 update: b 2/3 files (66.67%) |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
415 picked tool 'python ../merge' for b (binary False symlink False) |
3252 | 416 merging b |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10431
diff
changeset
|
417 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 |
10431
ba5e508b5e92
update: make calls to ui.progress()
Augie Fackler <durin42@gmail.com>
parents:
8753
diff
changeset
|
418 update: rev 3/3 files (100.00%) |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
419 picked tool 'python ../merge' for rev (binary False symlink False) |
3252 | 420 merging rev |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10431
diff
changeset
|
421 my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337 |
3252 | 422 0 files updated, 2 files merged, 1 files removed, 0 files unresolved |
423 (branch merge, don't forget to commit) | |
424 -------------- | |
425 M b | |
426 -------------- | |
427 | |
6336
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6004
diff
changeset
|
428 created new head |
3252 | 429 -------------- |
3281 | 430 test L:nc a b R:up a b W: - 16 get a, merge b no ancestor |
3252 | 431 -------------- |
8753
af5f099d932b
merge: refactor manifestmerge init to better report effective ancestor
Matt Mackall <mpm@selenic.com>
parents:
8748
diff
changeset
|
432 searching for copies back to rev 1 |
3252 | 433 resolving manifests |
3314 | 434 overwrite None partial False |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10431
diff
changeset
|
435 ancestor 924404dff337 local 86a2aa42fc76+ remote 8dbce441892a |
3252 | 436 a: remote is newer -> g |
437 b: versions differ -> m | |
438 rev: versions differ -> m | |
6512
368a4ec603cc
merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
439 preserving b for resolve of b |
368a4ec603cc
merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
440 preserving rev for resolve of rev |
10431
ba5e508b5e92
update: make calls to ui.progress()
Augie Fackler <durin42@gmail.com>
parents:
8753
diff
changeset
|
441 update: a 1/3 files (33.33%) |
3252 | 442 getting a |
10431
ba5e508b5e92
update: make calls to ui.progress()
Augie Fackler <durin42@gmail.com>
parents:
8753
diff
changeset
|
443 update: b 2/3 files (66.67%) |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
444 picked tool 'python ../merge' for b (binary False symlink False) |
3252 | 445 merging b |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10431
diff
changeset
|
446 my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000 |
10431
ba5e508b5e92
update: make calls to ui.progress()
Augie Fackler <durin42@gmail.com>
parents:
8753
diff
changeset
|
447 update: rev 3/3 files (100.00%) |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
448 picked tool 'python ../merge' for rev (binary False symlink False) |
3252 | 449 merging rev |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10431
diff
changeset
|
450 my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337 |
3252 | 451 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
452 (branch merge, don't forget to commit) | |
453 -------------- | |
454 M a | |
455 M b | |
456 -------------- | |
457 | |
6336
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6004
diff
changeset
|
458 created new head |
3252 | 459 -------------- |
3281 | 460 test L:up a b R:nc a b W: - 17 keep a, merge b no ancestor |
3252 | 461 -------------- |
8753
af5f099d932b
merge: refactor manifestmerge init to better report effective ancestor
Matt Mackall <mpm@selenic.com>
parents:
8748
diff
changeset
|
462 searching for copies back to rev 1 |
3252 | 463 resolving manifests |
3314 | 464 overwrite None partial False |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10431
diff
changeset
|
465 ancestor 924404dff337 local 0b76e65c8289+ remote 4ce40f5aca24 |
3252 | 466 b: versions differ -> m |
467 rev: versions differ -> m | |
6512
368a4ec603cc
merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
468 preserving b for resolve of b |
368a4ec603cc
merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
469 preserving rev for resolve of rev |
10431
ba5e508b5e92
update: make calls to ui.progress()
Augie Fackler <durin42@gmail.com>
parents:
8753
diff
changeset
|
470 update: b 1/2 files (50.00%) |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
471 picked tool 'python ../merge' for b (binary False symlink False) |
3252 | 472 merging b |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10431
diff
changeset
|
473 my b@0b76e65c8289+ other b@4ce40f5aca24 ancestor b@000000000000 |
10431
ba5e508b5e92
update: make calls to ui.progress()
Augie Fackler <durin42@gmail.com>
parents:
8753
diff
changeset
|
474 update: rev 2/2 files (100.00%) |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
475 picked tool 'python ../merge' for rev (binary False symlink False) |
3252 | 476 merging rev |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10431
diff
changeset
|
477 my rev@0b76e65c8289+ other rev@4ce40f5aca24 ancestor rev@924404dff337 |
3252 | 478 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
479 (branch merge, don't forget to commit) | |
480 -------------- | |
481 M b | |
5764
8a5d8fb59ed2
Backed out changeset c2a21fe60994
Matt Mackall <mpm@selenic.com>
parents:
5762
diff
changeset
|
482 C a |
3252 | 483 -------------- |
484 | |
6336
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6004
diff
changeset
|
485 created new head |
3252 | 486 -------------- |
487 test L:nm a b R:up a b W: - 18 merge b no ancestor | |
488 -------------- | |
8753
af5f099d932b
merge: refactor manifestmerge init to better report effective ancestor
Matt Mackall <mpm@selenic.com>
parents:
8748
diff
changeset
|
489 searching for copies back to rev 1 |
3252 | 490 resolving manifests |
3314 | 491 overwrite None partial False |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10431
diff
changeset
|
492 ancestor 924404dff337 local 02963e448370+ remote 8dbce441892a |
3252 | 493 b: versions differ -> m |
494 rev: versions differ -> m | |
7320
8dca507e56ce
ui: log non-interactive default response to stdout when verbose
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
6512
diff
changeset
|
495 remote changed a which local deleted |
8dca507e56ce
ui: log non-interactive default response to stdout when verbose
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
6512
diff
changeset
|
496 use (c)hanged version or leave (d)eleted? c |
3252 | 497 a: prompt recreating -> g |
6512
368a4ec603cc
merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
498 preserving b for resolve of b |
368a4ec603cc
merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
499 preserving rev for resolve of rev |
10431
ba5e508b5e92
update: make calls to ui.progress()
Augie Fackler <durin42@gmail.com>
parents:
8753
diff
changeset
|
500 update: a 1/3 files (33.33%) |
3252 | 501 getting a |
10431
ba5e508b5e92
update: make calls to ui.progress()
Augie Fackler <durin42@gmail.com>
parents:
8753
diff
changeset
|
502 update: b 2/3 files (66.67%) |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
503 picked tool 'python ../merge' for b (binary False symlink False) |
3252 | 504 merging b |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10431
diff
changeset
|
505 my b@02963e448370+ other b@8dbce441892a ancestor b@000000000000 |
10431
ba5e508b5e92
update: make calls to ui.progress()
Augie Fackler <durin42@gmail.com>
parents:
8753
diff
changeset
|
506 update: rev 3/3 files (100.00%) |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
507 picked tool 'python ../merge' for rev (binary False symlink False) |
3252 | 508 merging rev |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10431
diff
changeset
|
509 my rev@02963e448370+ other rev@8dbce441892a ancestor rev@924404dff337 |
3252 | 510 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
511 (branch merge, don't forget to commit) | |
512 -------------- | |
513 M a | |
514 M b | |
515 -------------- | |
516 | |
6336
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6004
diff
changeset
|
517 created new head |
3252 | 518 -------------- |
3281 | 519 test L:up a b R:nm a b W: - 19 merge b no ancestor, prompt remove a |
3252 | 520 -------------- |
8753
af5f099d932b
merge: refactor manifestmerge init to better report effective ancestor
Matt Mackall <mpm@selenic.com>
parents:
8748
diff
changeset
|
521 searching for copies back to rev 1 |
3252 | 522 resolving manifests |
3314 | 523 overwrite None partial False |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10431
diff
changeset
|
524 ancestor 924404dff337 local 0b76e65c8289+ remote bdb19105162a |
7320
8dca507e56ce
ui: log non-interactive default response to stdout when verbose
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
6512
diff
changeset
|
525 local changed a which remote deleted |
8dca507e56ce
ui: log non-interactive default response to stdout when verbose
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
6512
diff
changeset
|
526 use (c)hanged version or (d)elete? c |
7768
5bf5fd1e2a74
merge: mark kept local files as readded on linear update (issue539)
Matt Mackall <mpm@selenic.com>
parents:
7320
diff
changeset
|
527 a: prompt keep -> a |
3252 | 528 b: versions differ -> m |
529 rev: versions differ -> m | |
6512
368a4ec603cc
merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
530 preserving b for resolve of b |
368a4ec603cc
merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
531 preserving rev for resolve of rev |
10431
ba5e508b5e92
update: make calls to ui.progress()
Augie Fackler <durin42@gmail.com>
parents:
8753
diff
changeset
|
532 update: a 1/3 files (33.33%) |
ba5e508b5e92
update: make calls to ui.progress()
Augie Fackler <durin42@gmail.com>
parents:
8753
diff
changeset
|
533 update: b 2/3 files (66.67%) |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
534 picked tool 'python ../merge' for b (binary False symlink False) |
3252 | 535 merging b |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10431
diff
changeset
|
536 my b@0b76e65c8289+ other b@bdb19105162a ancestor b@000000000000 |
10431
ba5e508b5e92
update: make calls to ui.progress()
Augie Fackler <durin42@gmail.com>
parents:
8753
diff
changeset
|
537 update: rev 3/3 files (100.00%) |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
538 picked tool 'python ../merge' for rev (binary False symlink False) |
3252 | 539 merging rev |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10431
diff
changeset
|
540 my rev@0b76e65c8289+ other rev@bdb19105162a ancestor rev@924404dff337 |
3252 | 541 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
542 (branch merge, don't forget to commit) | |
543 -------------- | |
544 M b | |
5764
8a5d8fb59ed2
Backed out changeset c2a21fe60994
Matt Mackall <mpm@selenic.com>
parents:
5762
diff
changeset
|
545 C a |
3252 | 546 -------------- |
547 | |
6336
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6004
diff
changeset
|
548 created new head |
3252 | 549 -------------- |
550 test L:up a R:um a b W: - 20 merge a and b to b, remove a | |
551 -------------- | |
5387
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
552 searching for copies back to rev 1 |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
553 unmatched files in other: |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
554 b |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
555 all copies found (* = to merge, ! = divergent): |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
556 b -> a * |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
557 checking for directory renames |
8753
af5f099d932b
merge: refactor manifestmerge init to better report effective ancestor
Matt Mackall <mpm@selenic.com>
parents:
8748
diff
changeset
|
558 resolving manifests |
af5f099d932b
merge: refactor manifestmerge init to better report effective ancestor
Matt Mackall <mpm@selenic.com>
parents:
8748
diff
changeset
|
559 overwrite None partial False |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10431
diff
changeset
|
560 ancestor 924404dff337 local e300d1c794ec+ remote 49b6d8032493 |
3730
d377f8d25662
merge: only store one direction of copies in the copy map
Matt Mackall <mpm@selenic.com>
parents:
3727
diff
changeset
|
561 rev: versions differ -> m |
3727
0fb66912040a
merge: report destinations of moves in merge action messages
Matt Mackall <mpm@selenic.com>
parents:
3674
diff
changeset
|
562 a: remote moved to b -> m |
6512
368a4ec603cc
merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
563 preserving a for resolve of b |
368a4ec603cc
merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
564 preserving rev for resolve of rev |
3252 | 565 removing a |
10431
ba5e508b5e92
update: make calls to ui.progress()
Augie Fackler <durin42@gmail.com>
parents:
8753
diff
changeset
|
566 update: a 1/2 files (50.00%) |
6512
368a4ec603cc
merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
567 picked tool 'python ../merge' for b (binary False symlink False) |
368a4ec603cc
merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
568 merging a and b to b |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10431
diff
changeset
|
569 my b@e300d1c794ec+ other b@49b6d8032493 ancestor a@924404dff337 |
10431
ba5e508b5e92
update: make calls to ui.progress()
Augie Fackler <durin42@gmail.com>
parents:
8753
diff
changeset
|
570 update: rev 2/2 files (100.00%) |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
571 picked tool 'python ../merge' for rev (binary False symlink False) |
3252 | 572 merging rev |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10431
diff
changeset
|
573 my rev@e300d1c794ec+ other rev@49b6d8032493 ancestor rev@924404dff337 |
3252 | 574 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
575 (branch merge, don't forget to commit) | |
576 -------------- | |
577 M b | |
578 a | |
579 -------------- | |
580 | |
6336
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6004
diff
changeset
|
581 created new head |
3252 | 582 -------------- |
583 test L:um a b R:up a W: - 21 merge a and b to b | |
584 -------------- | |
5387
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
585 searching for copies back to rev 1 |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
586 unmatched files in local: |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
587 b |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
588 all copies found (* = to merge, ! = divergent): |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
589 b -> a * |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
590 checking for directory renames |
8753
af5f099d932b
merge: refactor manifestmerge init to better report effective ancestor
Matt Mackall <mpm@selenic.com>
parents:
8748
diff
changeset
|
591 resolving manifests |
af5f099d932b
merge: refactor manifestmerge init to better report effective ancestor
Matt Mackall <mpm@selenic.com>
parents:
8748
diff
changeset
|
592 overwrite None partial False |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10431
diff
changeset
|
593 ancestor 924404dff337 local 62e7bf090eba+ remote f4db7e329e71 |
8748
f325574dad1a
merge: combine a copy and move case
Matt Mackall <mpm@selenic.com>
parents:
7768
diff
changeset
|
594 b: local copied/moved to a -> m |
3252 | 595 rev: versions differ -> m |
6512
368a4ec603cc
merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
596 preserving b for resolve of b |
368a4ec603cc
merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
597 preserving rev for resolve of rev |
10431
ba5e508b5e92
update: make calls to ui.progress()
Augie Fackler <durin42@gmail.com>
parents:
8753
diff
changeset
|
598 update: b 1/2 files (50.00%) |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
599 picked tool 'python ../merge' for b (binary False symlink False) |
6512
368a4ec603cc
merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
600 merging b and a to b |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10431
diff
changeset
|
601 my b@62e7bf090eba+ other a@f4db7e329e71 ancestor a@924404dff337 |
10431
ba5e508b5e92
update: make calls to ui.progress()
Augie Fackler <durin42@gmail.com>
parents:
8753
diff
changeset
|
602 update: rev 2/2 files (100.00%) |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
603 picked tool 'python ../merge' for rev (binary False symlink False) |
3252 | 604 merging rev |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10431
diff
changeset
|
605 my rev@62e7bf090eba+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
3252 | 606 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
607 (branch merge, don't forget to commit) | |
608 -------------- | |
609 M b | |
3292
764688cf51e5
merge: remember rename copies and parents properly on commit
Matt Mackall <mpm@selenic.com>
parents:
3282
diff
changeset
|
610 a |
3252 | 611 -------------- |
612 | |
6336
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6004
diff
changeset
|
613 created new head |
3252 | 614 -------------- |
615 test L:nm a b R:up a c W: - 23 get c, keep b | |
616 -------------- | |
5387
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
617 searching for copies back to rev 1 |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
618 unmatched files in local: |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
619 b |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
620 unmatched files in other: |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
621 c |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
622 all copies found (* = to merge, ! = divergent): |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
623 b -> a * |
4b6f0aa568e5
Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents:
5042
diff
changeset
|
624 checking for directory renames |
8753
af5f099d932b
merge: refactor manifestmerge init to better report effective ancestor
Matt Mackall <mpm@selenic.com>
parents:
8748
diff
changeset
|
625 resolving manifests |
af5f099d932b
merge: refactor manifestmerge init to better report effective ancestor
Matt Mackall <mpm@selenic.com>
parents:
8748
diff
changeset
|
626 overwrite None partial False |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10431
diff
changeset
|
627 ancestor 924404dff337 local 02963e448370+ remote 2b958612230f |
8748
f325574dad1a
merge: combine a copy and move case
Matt Mackall <mpm@selenic.com>
parents:
7768
diff
changeset
|
628 b: local copied/moved to a -> m |
3252 | 629 rev: versions differ -> m |
630 c: remote created -> g | |
6512
368a4ec603cc
merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
631 preserving b for resolve of b |
368a4ec603cc
merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
632 preserving rev for resolve of rev |
10431
ba5e508b5e92
update: make calls to ui.progress()
Augie Fackler <durin42@gmail.com>
parents:
8753
diff
changeset
|
633 update: b 1/3 files (33.33%) |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
634 picked tool 'python ../merge' for b (binary False symlink False) |
6512
368a4ec603cc
merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
635 merging b and a to b |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10431
diff
changeset
|
636 my b@02963e448370+ other a@2b958612230f ancestor a@924404dff337 |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
637 premerge successful |
10431
ba5e508b5e92
update: make calls to ui.progress()
Augie Fackler <durin42@gmail.com>
parents:
8753
diff
changeset
|
638 update: c 2/3 files (66.67%) |
3252 | 639 getting c |
10431
ba5e508b5e92
update: make calls to ui.progress()
Augie Fackler <durin42@gmail.com>
parents:
8753
diff
changeset
|
640 update: rev 3/3 files (100.00%) |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5857
diff
changeset
|
641 picked tool 'python ../merge' for rev (binary False symlink False) |
3252 | 642 merging rev |
10490
f2618cacb485
filelog: sort meta entries, ensure deterministic order
Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
parents:
10431
diff
changeset
|
643 my rev@02963e448370+ other rev@2b958612230f ancestor rev@924404dff337 |
3252 | 644 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
645 (branch merge, don't forget to commit) | |
646 -------------- | |
647 M b | |
3292
764688cf51e5
merge: remember rename copies and parents properly on commit
Matt Mackall <mpm@selenic.com>
parents:
3282
diff
changeset
|
648 a |
3252 | 649 M c |
650 -------------- | |
651 |