annotate tests/test-rename-merge2.out @ 6206:0b6f12495276

fetch: switch the default parent used for a merge This treats newly pulled changes as authoritative, and local changes as the "satellite" changes. The prior default behaviour is still available, via the --switch-parent option.
author Bryan O'Sullivan <bos@serpentine.com>
date Wed, 05 Mar 2008 09:10:45 -0800
parents 5af5f0f9d724
children 4b0c9c674707
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
1 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
2 test L:up a R:nc a b W: - 1 get local a to b
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
3 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
4 resolving manifests
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
5 overwrite None partial False
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
6 ancestor 924404dff337 local e300d1c794ec+ remote 735846fee2d7
5387
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
7 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
8 unmatched files in other:
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
9 b
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
10 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
11 b -> a *
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
12 checking for directory renames
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
13 rev: versions differ -> m
3727
0fb66912040a merge: report destinations of moves in merge action messages
Matt Mackall <mpm@selenic.com>
parents: 3674
diff changeset
14 a: remote copied to b -> m
5042
f191bc3916f7 merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents: 4674
diff changeset
15 copying a to b
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
16 picked tool 'python ../merge' for a (binary False symlink False)
3311
966632304dde merge: shortcircuit filemerge for identical files
Matt Mackall <mpm@selenic.com>
parents: 3308
diff changeset
17 merging a and b
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
18 my a@e300d1c794ec+ other b@735846fee2d7 ancestor a@924404dff337
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
19 premerge successful
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
20 picked tool 'python ../merge' for rev (binary False symlink False)
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
21 merging rev
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
22 my rev@e300d1c794ec+ other rev@735846fee2d7 ancestor rev@924404dff337
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
23 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
24 (branch merge, don't forget to commit)
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
25 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
26 M b
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
27 a
5764
8a5d8fb59ed2 Backed out changeset c2a21fe60994
Matt Mackall <mpm@selenic.com>
parents: 5762
diff changeset
28 C a
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
29 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
30
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
31 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
32 test L:nc a b R:up a W: - 2 get rem change to a and b
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
33 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
34 resolving manifests
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
35 overwrite None partial False
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
36 ancestor 924404dff337 local ac809aeed39a+ remote f4db7e329e71
5387
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
37 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
38 unmatched files in local:
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
39 b
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
40 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
41 b -> a *
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
42 checking for directory renames
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
43 a: remote is newer -> g
3727
0fb66912040a merge: report destinations of moves in merge action messages
Matt Mackall <mpm@selenic.com>
parents: 3674
diff changeset
44 b: local copied to a -> m
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
45 rev: versions differ -> m
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
46 getting a
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
47 picked tool 'python ../merge' for b (binary False symlink False)
3311
966632304dde merge: shortcircuit filemerge for identical files
Matt Mackall <mpm@selenic.com>
parents: 3308
diff changeset
48 merging b and a
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
49 my b@ac809aeed39a+ other a@f4db7e329e71 ancestor a@924404dff337
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
50 premerge successful
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
51 picked tool 'python ../merge' for rev (binary False symlink False)
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
52 merging rev
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
53 my rev@ac809aeed39a+ other rev@f4db7e329e71 ancestor rev@924404dff337
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
54 1 files updated, 2 files merged, 0 files removed, 0 files unresolved
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
55 (branch merge, don't forget to commit)
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
56 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
57 M a
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
58 M b
3292
764688cf51e5 merge: remember rename copies and parents properly on commit
Matt Mackall <mpm@selenic.com>
parents: 3282
diff changeset
59 a
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
60 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
61
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
62 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
63 test L:up a R:nm a b W: - 3 get local a change to b, remove a
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
64 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
65 resolving manifests
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
66 overwrite None partial False
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
67 ancestor 924404dff337 local e300d1c794ec+ remote e03727d2d66b
5387
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
68 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
69 unmatched files in other:
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
70 b
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
71 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
72 b -> a *
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
73 checking for directory renames
3730
d377f8d25662 merge: only store one direction of copies in the copy map
Matt Mackall <mpm@selenic.com>
parents: 3727
diff changeset
74 rev: versions differ -> m
3727
0fb66912040a merge: report destinations of moves in merge action messages
Matt Mackall <mpm@selenic.com>
parents: 3674
diff changeset
75 a: remote moved to b -> m
5042
f191bc3916f7 merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents: 4674
diff changeset
76 copying a to b
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
77 picked tool 'python ../merge' for a (binary False symlink False)
3311
966632304dde merge: shortcircuit filemerge for identical files
Matt Mackall <mpm@selenic.com>
parents: 3308
diff changeset
78 merging a and b
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
79 my a@e300d1c794ec+ other b@e03727d2d66b ancestor a@924404dff337
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
80 premerge successful
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
81 removing a
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
82 picked tool 'python ../merge' for rev (binary False symlink False)
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
83 merging rev
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
84 my rev@e300d1c794ec+ other rev@e03727d2d66b ancestor rev@924404dff337
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
85 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
86 (branch merge, don't forget to commit)
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
87 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
88 M b
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
89 a
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
90 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
91
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
92 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
93 test L:nm a b R:up a W: - 4 get remote change to b
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
94 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
95 resolving manifests
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
96 overwrite None partial False
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
97 ancestor 924404dff337 local ecf3cb2a4219+ remote f4db7e329e71
5387
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
98 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
99 unmatched files in local:
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
100 b
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
101 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
102 b -> a *
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
103 checking for directory renames
3727
0fb66912040a merge: report destinations of moves in merge action messages
Matt Mackall <mpm@selenic.com>
parents: 3674
diff changeset
104 b: local moved to a -> m
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
105 rev: versions differ -> m
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
106 picked tool 'python ../merge' for b (binary False symlink False)
3311
966632304dde merge: shortcircuit filemerge for identical files
Matt Mackall <mpm@selenic.com>
parents: 3308
diff changeset
107 merging b and a
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
108 my b@ecf3cb2a4219+ other a@f4db7e329e71 ancestor a@924404dff337
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
109 premerge successful
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
110 picked tool 'python ../merge' for rev (binary False symlink False)
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
111 merging rev
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
112 my rev@ecf3cb2a4219+ other rev@f4db7e329e71 ancestor rev@924404dff337
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
113 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
114 (branch merge, don't forget to commit)
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
115 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
116 M b
3292
764688cf51e5 merge: remember rename copies and parents properly on commit
Matt Mackall <mpm@selenic.com>
parents: 3282
diff changeset
117 a
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
118 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
119
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
120 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
121 test L: R:nc a b W: - 5 get b
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
122 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
123 resolving manifests
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
124 overwrite None partial False
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
125 ancestor 924404dff337 local 94b33a1b7f2d+ remote 735846fee2d7
5387
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
126 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
127 unmatched files in other:
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
128 b
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
129 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
130 b -> a
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
131 checking for directory renames
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
132 rev: versions differ -> m
4416
bb1800a7d7e1 merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents: 4304
diff changeset
133 b: remote created -> g
bb1800a7d7e1 merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents: 4304
diff changeset
134 getting b
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
135 picked tool 'python ../merge' for rev (binary False symlink False)
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
136 merging rev
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
137 my rev@94b33a1b7f2d+ other rev@735846fee2d7 ancestor rev@924404dff337
3400
d2b55e3c4e25 merge: if filemerge skips merge, report as updated
Matt Mackall <mpm@selenic.com>
parents: 3314
diff changeset
138 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
139 (branch merge, don't forget to commit)
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
140 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
141 M b
5764
8a5d8fb59ed2 Backed out changeset c2a21fe60994
Matt Mackall <mpm@selenic.com>
parents: 5762
diff changeset
142 C a
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
143 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
144
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
145 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
146 test L:nc a b R: W: - 6 nothing
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
147 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
148 resolving manifests
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
149 overwrite None partial False
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
150 ancestor 924404dff337 local ac809aeed39a+ remote 97c705ade336
5387
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
151 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
152 unmatched files in local:
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
153 b
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
154 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
155 b -> a
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
156 checking for directory renames
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
157 rev: versions differ -> m
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
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
159 merging rev
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
160 my rev@ac809aeed39a+ 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
161 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
162 (branch merge, don't forget to commit)
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
163 --------------
5764
8a5d8fb59ed2 Backed out changeset c2a21fe60994
Matt Mackall <mpm@selenic.com>
parents: 5762
diff changeset
164 C a
8a5d8fb59ed2 Backed out changeset c2a21fe60994
Matt Mackall <mpm@selenic.com>
parents: 5762
diff changeset
165 C b
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
166 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
167
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
168 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
169 test L: R:nm a b W: - 7 get b
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
170 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
171 resolving manifests
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
172 overwrite None partial False
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
173 ancestor 924404dff337 local 94b33a1b7f2d+ remote e03727d2d66b
5387
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
174 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
175 unmatched files in other:
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
176 b
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
177 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
178 b -> a
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
179 checking for directory renames
4416
bb1800a7d7e1 merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents: 4304
diff changeset
180 a: other deleted -> r
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
181 rev: versions differ -> m
4416
bb1800a7d7e1 merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents: 4304
diff changeset
182 b: remote created -> g
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
183 removing a
4416
bb1800a7d7e1 merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents: 4304
diff changeset
184 getting b
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
185 picked tool 'python ../merge' for rev (binary False symlink False)
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
186 merging rev
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
187 my rev@94b33a1b7f2d+ other rev@e03727d2d66b ancestor rev@924404dff337
4416
bb1800a7d7e1 merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents: 4304
diff changeset
188 1 files updated, 1 files merged, 1 files removed, 0 files unresolved
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
189 (branch merge, don't forget to commit)
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
190 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
191 M b
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
192 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
193
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
194 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
195 test L:nm a b R: W: - 8 nothing
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
196 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
197 resolving manifests
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
198 overwrite None partial False
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
199 ancestor 924404dff337 local ecf3cb2a4219+ remote 97c705ade336
5387
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
200 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
201 unmatched files in local:
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
202 b
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
203 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
204 b -> a
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
205 checking for directory renames
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
206 rev: versions differ -> m
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
207 picked tool 'python ../merge' for rev (binary False symlink False)
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
208 merging rev
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
209 my rev@ecf3cb2a4219+ 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
210 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
211 (branch merge, don't forget to commit)
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
212 --------------
5764
8a5d8fb59ed2 Backed out changeset c2a21fe60994
Matt Mackall <mpm@selenic.com>
parents: 5762
diff changeset
213 C b
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
214 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
215
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
216 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
217 test L:um a b R:um a b W: - 9 do merge with ancestor in a
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
218 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
219 resolving manifests
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
220 overwrite None partial False
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
221 ancestor 924404dff337 local ec03c2ca8642+ remote 79cc6877a3b7
5387
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
222 searching for copies back to rev 1
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
223 b: versions differ -> m
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
224 rev: versions differ -> m
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
225 picked tool 'python ../merge' for b (binary False symlink False)
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
226 merging b
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
227 my b@ec03c2ca8642+ other b@79cc6877a3b7 ancestor a@924404dff337
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
228 picked tool 'python ../merge' for rev (binary False symlink False)
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
229 merging rev
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
230 my rev@ec03c2ca8642+ other rev@79cc6877a3b7 ancestor rev@924404dff337
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
231 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
232 (branch merge, don't forget to commit)
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
233 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
234 M b
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
235 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
236
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
237 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
238 test L:nm a b R:nm a c W: - 11 get c, keep b
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
239 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
240 resolving manifests
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
241 overwrite None partial False
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
242 ancestor 924404dff337 local ecf3cb2a4219+ remote e6abcc1a30c2
5387
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
243 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
244 unmatched files in local:
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
245 b
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
246 unmatched files in other:
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
247 c
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
248 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
249 c -> a !
c704b03884ef merge: add a bit more sanity to divergent copy checks
Matt Mackall <mpm@selenic.com>
parents: 5764
diff changeset
250 b -> a !
5387
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
251 checking for directory renames
4674
723e0ddb6ada merge: warn user about divergent renames
Matt Mackall <mpm@selenic.com>
parents: 4416
diff changeset
252 a: divergent renames -> dr
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
253 rev: versions differ -> m
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
254 c: remote created -> g
4674
723e0ddb6ada merge: warn user about divergent renames
Matt Mackall <mpm@selenic.com>
parents: 4416
diff changeset
255 warning: detected divergent renames of a to:
723e0ddb6ada merge: warn user about divergent renames
Matt Mackall <mpm@selenic.com>
parents: 4416
diff changeset
256 b
723e0ddb6ada merge: warn user about divergent renames
Matt Mackall <mpm@selenic.com>
parents: 4416
diff changeset
257 c
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
258 getting c
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
259 picked tool 'python ../merge' for rev (binary False symlink False)
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
260 merging rev
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
261 my rev@ecf3cb2a4219+ other rev@e6abcc1a30c2 ancestor rev@924404dff337
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
262 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
263 (branch merge, don't forget to commit)
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
264 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
265 M c
5764
8a5d8fb59ed2 Backed out changeset c2a21fe60994
Matt Mackall <mpm@selenic.com>
parents: 5762
diff changeset
266 C b
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
267 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
268
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
269 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
270 test L:nc a b R:up b W: - 12 merge b no ancestor
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
271 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
272 resolving manifests
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
273 overwrite None partial False
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
274 ancestor 924404dff337 local ac809aeed39a+ remote af30c7647fc7
5387
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
275 searching for copies back to rev 1
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
276 b: versions differ -> m
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
277 rev: versions differ -> m
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
278 picked tool 'python ../merge' for b (binary False symlink False)
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
279 merging b
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
280 my b@ac809aeed39a+ other b@af30c7647fc7 ancestor b@000000000000
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
281 picked tool 'python ../merge' for rev (binary False symlink False)
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
282 merging rev
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
283 my rev@ac809aeed39a+ other rev@af30c7647fc7 ancestor rev@924404dff337
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
284 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
285 (branch merge, don't forget to commit)
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
286 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
287 M b
5764
8a5d8fb59ed2 Backed out changeset c2a21fe60994
Matt Mackall <mpm@selenic.com>
parents: 5762
diff changeset
288 C a
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
289 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
290
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
291 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
292 test L:up b R:nm a b W: - 13 merge b no ancestor
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
293 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
294 resolving manifests
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
295 overwrite None partial False
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
296 ancestor 924404dff337 local 59318016310c+ remote e03727d2d66b
5387
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
297 searching for copies back to rev 1
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
298 a: other deleted -> r
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
299 b: versions differ -> m
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
300 rev: versions differ -> m
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
301 removing a
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
302 picked tool 'python ../merge' for b (binary False symlink False)
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
303 merging b
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
304 my b@59318016310c+ other b@e03727d2d66b ancestor b@000000000000
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
305 picked tool 'python ../merge' for rev (binary False symlink False)
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
306 merging rev
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
307 my rev@59318016310c+ other rev@e03727d2d66b ancestor rev@924404dff337
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
308 0 files updated, 2 files merged, 1 files removed, 0 files unresolved
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
309 (branch merge, don't forget to commit)
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
310 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
311 M b
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
312 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
313
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
314 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
315 test L:nc a b R:up a b W: - 14 merge b no ancestor
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
316 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
317 resolving manifests
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
318 overwrite None partial False
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
319 ancestor 924404dff337 local ac809aeed39a+ remote 8dbce441892a
5387
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
320 searching for copies back to rev 1
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
321 a: remote is newer -> g
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
322 b: versions differ -> m
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
323 rev: versions differ -> m
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
324 getting a
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
325 picked tool 'python ../merge' for b (binary False symlink False)
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
326 merging b
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
327 my b@ac809aeed39a+ other b@8dbce441892a ancestor b@000000000000
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
328 picked tool 'python ../merge' for rev (binary False symlink False)
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
329 merging rev
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
330 my rev@ac809aeed39a+ other rev@8dbce441892a ancestor rev@924404dff337
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
331 1 files updated, 2 files merged, 0 files removed, 0 files unresolved
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
332 (branch merge, don't forget to commit)
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
333 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
334 M a
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
335 M b
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
336 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
337
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
338 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
339 test L:up b R:nm a b W: - 15 merge b no ancestor, remove a
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
340 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
341 resolving manifests
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
342 overwrite None partial False
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
343 ancestor 924404dff337 local 59318016310c+ remote e03727d2d66b
5387
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
344 searching for copies back to rev 1
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
345 a: other deleted -> r
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
346 b: versions differ -> m
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
347 rev: versions differ -> m
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
348 removing a
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
349 picked tool 'python ../merge' for b (binary False symlink False)
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
350 merging b
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
351 my b@59318016310c+ other b@e03727d2d66b ancestor b@000000000000
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
352 picked tool 'python ../merge' for rev (binary False symlink False)
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
353 merging rev
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
354 my rev@59318016310c+ other rev@e03727d2d66b ancestor rev@924404dff337
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
355 0 files updated, 2 files merged, 1 files removed, 0 files unresolved
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
356 (branch merge, don't forget to commit)
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
357 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
358 M b
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
359 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
360
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
361 --------------
3281
f49c90b46897 Update test output
Matt Mackall <mpm@selenic.com>
parents: 3252
diff changeset
362 test L:nc a b R:up a b W: - 16 get a, merge b no ancestor
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
363 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
364 resolving manifests
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
365 overwrite None partial False
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
366 ancestor 924404dff337 local ac809aeed39a+ remote 8dbce441892a
5387
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
367 searching for copies back to rev 1
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
368 a: remote is newer -> g
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
369 b: versions differ -> m
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
370 rev: versions differ -> m
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
371 getting a
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
372 picked tool 'python ../merge' for b (binary False symlink False)
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
373 merging b
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
374 my b@ac809aeed39a+ other b@8dbce441892a ancestor b@000000000000
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
375 picked tool 'python ../merge' for rev (binary False symlink False)
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
376 merging rev
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
377 my rev@ac809aeed39a+ other rev@8dbce441892a ancestor rev@924404dff337
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
378 1 files updated, 2 files merged, 0 files removed, 0 files unresolved
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
379 (branch merge, don't forget to commit)
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
380 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
381 M a
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
382 M b
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
383 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
384
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
385 --------------
3281
f49c90b46897 Update test output
Matt Mackall <mpm@selenic.com>
parents: 3252
diff changeset
386 test L:up a b R:nc a b W: - 17 keep a, merge b no ancestor
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
387 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
388 resolving manifests
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
389 overwrite None partial False
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
390 ancestor 924404dff337 local 0b76e65c8289+ remote 735846fee2d7
5387
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
391 searching for copies back to rev 1
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
392 b: versions differ -> m
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
393 rev: versions differ -> m
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
394 picked tool 'python ../merge' for b (binary False symlink False)
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
395 merging b
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
396 my b@0b76e65c8289+ other b@735846fee2d7 ancestor b@000000000000
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
397 picked tool 'python ../merge' for rev (binary False symlink False)
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
398 merging rev
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
399 my rev@0b76e65c8289+ other rev@735846fee2d7 ancestor rev@924404dff337
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
400 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
401 (branch merge, don't forget to commit)
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
402 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
403 M b
5764
8a5d8fb59ed2 Backed out changeset c2a21fe60994
Matt Mackall <mpm@selenic.com>
parents: 5762
diff changeset
404 C a
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
405 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
406
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
407 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
408 test L:nm a b R:up a b W: - 18 merge b no ancestor
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
409 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
410 resolving manifests
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
411 overwrite None partial False
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
412 ancestor 924404dff337 local ecf3cb2a4219+ remote 8dbce441892a
5387
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
413 searching for copies back to rev 1
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
414 b: versions differ -> m
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
415 rev: versions differ -> m
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
416 a: prompt recreating -> g
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
417 getting a
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
418 picked tool 'python ../merge' for b (binary False symlink False)
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
419 merging b
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
420 my b@ecf3cb2a4219+ other b@8dbce441892a ancestor b@000000000000
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
421 picked tool 'python ../merge' for rev (binary False symlink False)
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
422 merging rev
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
423 my rev@ecf3cb2a4219+ other rev@8dbce441892a ancestor rev@924404dff337
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
424 1 files updated, 2 files merged, 0 files removed, 0 files unresolved
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
425 (branch merge, don't forget to commit)
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
426 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
427 M a
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
428 M b
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
429 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
430
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
431 --------------
3281
f49c90b46897 Update test output
Matt Mackall <mpm@selenic.com>
parents: 3252
diff changeset
432 test L:up a b R:nm a b W: - 19 merge b no ancestor, prompt remove a
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
433 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
434 resolving manifests
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
435 overwrite None partial False
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
436 ancestor 924404dff337 local 0b76e65c8289+ remote e03727d2d66b
5387
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
437 searching for copies back to rev 1
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
438 b: versions differ -> m
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
439 rev: versions differ -> m
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
440 picked tool 'python ../merge' for b (binary False symlink False)
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
441 merging b
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
442 my b@0b76e65c8289+ other b@e03727d2d66b ancestor b@000000000000
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
443 picked tool 'python ../merge' for rev (binary False symlink False)
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
444 merging rev
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
445 my rev@0b76e65c8289+ other rev@e03727d2d66b ancestor rev@924404dff337
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
446 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
447 (branch merge, don't forget to commit)
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
448 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
449 M b
5764
8a5d8fb59ed2 Backed out changeset c2a21fe60994
Matt Mackall <mpm@selenic.com>
parents: 5762
diff changeset
450 C a
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
451 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
452
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
453 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
454 test L:up a R:um a b W: - 20 merge a and b to b, remove a
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
455 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
456 resolving manifests
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
457 overwrite None partial False
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
458 ancestor 924404dff337 local e300d1c794ec+ remote 79cc6877a3b7
5387
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
459 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
460 unmatched files in other:
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
461 b
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
462 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
463 b -> a *
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
464 checking for directory renames
3730
d377f8d25662 merge: only store one direction of copies in the copy map
Matt Mackall <mpm@selenic.com>
parents: 3727
diff changeset
465 rev: versions differ -> m
3727
0fb66912040a merge: report destinations of moves in merge action messages
Matt Mackall <mpm@selenic.com>
parents: 3674
diff changeset
466 a: remote moved to b -> m
5042
f191bc3916f7 merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents: 4674
diff changeset
467 copying a to b
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
468 picked tool 'python ../merge' for a (binary False symlink False)
3311
966632304dde merge: shortcircuit filemerge for identical files
Matt Mackall <mpm@selenic.com>
parents: 3308
diff changeset
469 merging a and b
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
470 my a@e300d1c794ec+ other b@79cc6877a3b7 ancestor a@924404dff337
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
471 removing a
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
472 picked tool 'python ../merge' for rev (binary False symlink False)
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
473 merging rev
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
474 my rev@e300d1c794ec+ other rev@79cc6877a3b7 ancestor rev@924404dff337
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
475 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
476 (branch merge, don't forget to commit)
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
477 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
478 M b
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
479 a
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
480 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
481
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
482 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
483 test L:um a b R:up a W: - 21 merge a and b to b
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
484 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
485 resolving manifests
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
486 overwrite None partial False
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
487 ancestor 924404dff337 local ec03c2ca8642+ remote f4db7e329e71
5387
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
488 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
489 unmatched files in local:
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
490 b
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
491 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
492 b -> a *
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
493 checking for directory renames
3727
0fb66912040a merge: report destinations of moves in merge action messages
Matt Mackall <mpm@selenic.com>
parents: 3674
diff changeset
494 b: local moved to a -> m
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
495 rev: versions differ -> m
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
496 picked tool 'python ../merge' for b (binary False symlink False)
3311
966632304dde merge: shortcircuit filemerge for identical files
Matt Mackall <mpm@selenic.com>
parents: 3308
diff changeset
497 merging b and a
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
498 my b@ec03c2ca8642+ other a@f4db7e329e71 ancestor a@924404dff337
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
499 picked tool 'python ../merge' for rev (binary False symlink False)
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
500 merging rev
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
501 my rev@ec03c2ca8642+ other rev@f4db7e329e71 ancestor rev@924404dff337
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
502 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
503 (branch merge, don't forget to commit)
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
504 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
505 M b
3292
764688cf51e5 merge: remember rename copies and parents properly on commit
Matt Mackall <mpm@selenic.com>
parents: 3282
diff changeset
506 a
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
507 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
508
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
509 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
510 test L:nm a b R:up a c W: - 23 get c, keep b
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
511 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
512 resolving manifests
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
513 overwrite None partial False
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
514 ancestor 924404dff337 local ecf3cb2a4219+ remote 2b958612230f
5387
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
515 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
516 unmatched files in local:
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
517 b
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
518 unmatched files in other:
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
519 c
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
520 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
521 b -> a *
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
522 checking for directory renames
3727
0fb66912040a merge: report destinations of moves in merge action messages
Matt Mackall <mpm@selenic.com>
parents: 3674
diff changeset
523 b: local moved to a -> m
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
524 rev: versions differ -> m
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
525 c: remote created -> g
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
526 picked tool 'python ../merge' for b (binary False symlink False)
3311
966632304dde merge: shortcircuit filemerge for identical files
Matt Mackall <mpm@selenic.com>
parents: 3308
diff changeset
527 merging b and a
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
528 my b@ecf3cb2a4219+ other a@2b958612230f ancestor a@924404dff337
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
529 premerge successful
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
530 getting c
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
531 picked tool 'python ../merge' for rev (binary False symlink False)
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
532 merging rev
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
533 my rev@ecf3cb2a4219+ other rev@2b958612230f ancestor rev@924404dff337
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
534 1 files updated, 2 files merged, 0 files removed, 0 files unresolved
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
535 (branch merge, don't forget to commit)
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
536 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
537 M b
3292
764688cf51e5 merge: remember rename copies and parents properly on commit
Matt Mackall <mpm@selenic.com>
parents: 3282
diff changeset
538 a
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
539 M c
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
540 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
541