##// END OF EJS Templates
merge: report destinations of moves in merge action messages
Matt Mackall -
r3727:0fb66912 default
parent child Browse files
Show More
@@ -224,13 +224,14 b' def manifestmerge(repo, p1, p2, pa, over'
224 224 elif f in copy:
225 225 f2 = copy[f]
226 226 if f in ma: # case 3,20 A/B/A
227 act("remote moved", "m", f, f2, f2, fmerge(f, f2, f), True)
227 act("remote moved to " + f2, "m",
228 f, f2, f2, fmerge(f, f2, f), True)
228 229 else:
229 230 if f2 in m1: # case 2 A,B/B/B
230 act("local copied", "m",
231 act("local copied to " + f2, "m",
231 232 f, f2, f, fmerge(f, f2, f2), False)
232 233 else: # case 4,21 A/B/B
233 act("local moved", "m",
234 act("local moved to " + f2, "m",
234 235 f, f2, f, fmerge(f, f2, f2), False)
235 236 elif f in ma:
236 237 if n != ma[f] and not overwrite:
@@ -255,7 +256,8 b' def manifestmerge(repo, p1, p2, pa, over'
255 256 if f2 not in m2: # already seen
256 257 continue
257 258 # rename case 1, A/A,B/A
258 act("remote copied", "m", f2, f, f, fmerge(f2, f, f2), False)
259 act("remote copied to " + f, "m",
260 f2, f, f, fmerge(f2, f, f2), False)
259 261 elif f in ma:
260 262 if overwrite or backwards:
261 263 act("recreating", "g", f, m2.execf(f))
@@ -4,7 +4,7 b' merge'
4 4 resolving manifests
5 5 overwrite None partial False
6 6 ancestor af1939970a1c local f26ec4fc3fa3+ remote 8e765a822af2
7 a: remote moved -> m
7 a: remote moved to b -> m
8 8 b2: remote created -> g
9 9 merging a and b
10 10 my a@f26ec4fc3fa3+ other b@8e765a822af2 ancestor a@af1939970a1c
@@ -5,7 +5,7 b' resolving manifests'
5 5 overwrite None partial False
6 6 ancestor 924404dff337 local e300d1c794ec+ remote 735846fee2d7
7 7 rev: versions differ -> m
8 a: remote copied -> m
8 a: remote copied to b -> m
9 9 merging a and b
10 10 my a@e300d1c794ec+ other b@735846fee2d7 ancestor a@924404dff337
11 11 copying a to b
@@ -26,7 +26,7 b' resolving manifests'
26 26 overwrite None partial False
27 27 ancestor 924404dff337 local ac809aeed39a+ remote f4db7e329e71
28 28 a: remote is newer -> g
29 b: local copied -> m
29 b: local copied to a -> m
30 30 rev: versions differ -> m
31 31 getting a
32 32 merging b and a
@@ -47,7 +47,7 b' test L:up a R:nm a b W: - 3 get'
47 47 resolving manifests
48 48 overwrite None partial False
49 49 ancestor 924404dff337 local e300d1c794ec+ remote e03727d2d66b
50 a: remote moved -> m
50 a: remote moved to b -> m
51 51 rev: versions differ -> m
52 52 merging a and b
53 53 my a@e300d1c794ec+ other b@e03727d2d66b ancestor a@924404dff337
@@ -68,7 +68,7 b' test L:nm a b R:up a W: - 4 get'
68 68 resolving manifests
69 69 overwrite None partial False
70 70 ancestor 924404dff337 local ecf3cb2a4219+ remote f4db7e329e71
71 b: local moved -> m
71 b: local moved to a -> m
72 72 rev: versions differ -> m
73 73 merging b and a
74 74 my b@ecf3cb2a4219+ other a@f4db7e329e71 ancestor a@924404dff337
@@ -351,7 +351,7 b' test L:up a R:um a b W: - 20 mer'
351 351 resolving manifests
352 352 overwrite None partial False
353 353 ancestor 924404dff337 local e300d1c794ec+ remote 79cc6877a3b7
354 a: remote moved -> m
354 a: remote moved to b -> m
355 355 rev: versions differ -> m
356 356 merging a and b
357 357 my a@e300d1c794ec+ other b@79cc6877a3b7 ancestor a@924404dff337
@@ -372,7 +372,7 b' test L:um a b R:up a W: - 21 mer'
372 372 resolving manifests
373 373 overwrite None partial False
374 374 ancestor 924404dff337 local ec03c2ca8642+ remote f4db7e329e71
375 b: local moved -> m
375 b: local moved to a -> m
376 376 rev: versions differ -> m
377 377 merging b and a
378 378 my b@ec03c2ca8642+ other a@f4db7e329e71 ancestor a@924404dff337
@@ -391,7 +391,7 b' test L:nm a b R:up a c W: - 23 get'
391 391 resolving manifests
392 392 overwrite None partial False
393 393 ancestor 924404dff337 local ecf3cb2a4219+ remote 2b958612230f
394 b: local moved -> m
394 b: local moved to a -> m
395 395 rev: versions differ -> m
396 396 c: remote created -> g
397 397 merging b and a
General Comments 0
You need to be logged in to leave comments. Login now