Show More
@@ -199,11 +199,8 b' def manifestmerge(repo, p1, p2, pa, over' | |||||
199 | if f2 not in m2: # directory rename |
|
199 | if f2 not in m2: # directory rename | |
200 | act("remote renamed directory to " + f2, "d", |
|
200 | act("remote renamed directory to " + f2, "d", | |
201 | f, None, f2, m1.flags(f)) |
|
201 | f, None, f2, m1.flags(f)) | |
202 |
el |
|
202 | else: # case 2 A,B/B/B or case 4,21 A/B/B | |
203 | act("local copied to " + f2, "m", |
|
203 | act("local copied/moved to " + f2, "m", | |
204 | f, f2, f, fmerge(f, f2, f2), False) |
|
|||
205 | else: # case 4,21 A/B/B |
|
|||
206 | act("local moved to " + f2, "m", |
|
|||
207 | f, f2, f, fmerge(f, f2, f2), False) |
|
204 | f, f2, f, fmerge(f, f2, f2), False) | |
208 | elif n[20:] == "a": # added, no remote |
|
205 | elif n[20:] == "a": # added, no remote | |
209 | act("remote deleted", "f", f) |
|
206 | act("remote deleted", "f", f) |
@@ -29,7 +29,7 b' resolving manifests' | |||||
29 | all copies found (* = to merge, ! = divergent): |
|
29 | all copies found (* = to merge, ! = divergent): | |
30 | 1a -> 1 * |
|
30 | 1a -> 1 * | |
31 | checking for directory renames |
|
31 | checking for directory renames | |
32 | 1a: local moved to 1 -> m |
|
32 | 1a: local copied/moved to 1 -> m | |
33 | preserving 1a for resolve of 1a |
|
33 | preserving 1a for resolve of 1a | |
34 | picked tool 'internal:merge' for 1a (binary False symlink False) |
|
34 | picked tool 'internal:merge' for 1a (binary False symlink False) | |
35 | merging 1a and 1 to 1a |
|
35 | merging 1a and 1 to 1a |
@@ -44,7 +44,7 b' resolving manifests' | |||||
44 | b -> a * |
|
44 | b -> a * | |
45 | checking for directory renames |
|
45 | checking for directory renames | |
46 | a: remote is newer -> g |
|
46 | a: remote is newer -> g | |
47 | b: local copied to a -> m |
|
47 | b: local copied/moved to a -> m | |
48 | rev: versions differ -> m |
|
48 | rev: versions differ -> m | |
49 | preserving b for resolve of b |
|
49 | preserving b for resolve of b | |
50 | preserving rev for resolve of rev |
|
50 | preserving rev for resolve of rev | |
@@ -109,7 +109,7 b' resolving manifests' | |||||
109 | all copies found (* = to merge, ! = divergent): |
|
109 | all copies found (* = to merge, ! = divergent): | |
110 | b -> a * |
|
110 | b -> a * | |
111 | checking for directory renames |
|
111 | checking for directory renames | |
112 | b: local moved to a -> m |
|
112 | b: local copied/moved to a -> m | |
113 | rev: versions differ -> m |
|
113 | rev: versions differ -> m | |
114 | preserving b for resolve of b |
|
114 | preserving b for resolve of b | |
115 | preserving rev for resolve of rev |
|
115 | preserving rev for resolve of rev | |
@@ -546,7 +546,7 b' resolving manifests' | |||||
546 | all copies found (* = to merge, ! = divergent): |
|
546 | all copies found (* = to merge, ! = divergent): | |
547 | b -> a * |
|
547 | b -> a * | |
548 | checking for directory renames |
|
548 | checking for directory renames | |
549 | b: local moved to a -> m |
|
549 | b: local copied/moved to a -> m | |
550 | rev: versions differ -> m |
|
550 | rev: versions differ -> m | |
551 | preserving b for resolve of b |
|
551 | preserving b for resolve of b | |
552 | preserving rev for resolve of rev |
|
552 | preserving rev for resolve of rev | |
@@ -578,7 +578,7 b' resolving manifests' | |||||
578 | all copies found (* = to merge, ! = divergent): |
|
578 | all copies found (* = to merge, ! = divergent): | |
579 | b -> a * |
|
579 | b -> a * | |
580 | checking for directory renames |
|
580 | checking for directory renames | |
581 | b: local moved to a -> m |
|
581 | b: local copied/moved to a -> m | |
582 | rev: versions differ -> m |
|
582 | rev: versions differ -> m | |
583 | c: remote created -> g |
|
583 | c: remote created -> g | |
584 | preserving b for resolve of b |
|
584 | preserving b for resolve of b |
General Comments 0
You need to be logged in to leave comments.
Login now