Show More
@@ -571,8 +571,11 b' def manifestmerge(repo, wctx, p2, pa, br' | |||
|
571 | 571 | |
|
572 | 572 | return actions |
|
573 | 573 | |
|
574 | actionpriority = dict((m, p) for p, m in enumerate( | |
|
575 | ['r', 'f', 'g', 'a', 'k', 'm', 'dm', 'dg', 'dr', 'cd', 'dc', 'rd', 'e'])) | |
|
576 | ||
|
574 | 577 | def actionkey(a): |
|
575 | return a[1] in "rf" and -1 or 0, a | |
|
578 | return actionpriority[a[1]], a | |
|
576 | 579 | |
|
577 | 580 | def getremove(repo, mctx, overwrite, args): |
|
578 | 581 | """apply usually-non-interactive updates to the working directory |
@@ -848,16 +851,16 b' def recordupdates(repo, actions, branchm' | |||
|
848 | 851 | |
|
849 | 852 | for a in actions: |
|
850 | 853 | f, m, args, msg = a |
|
851 | if m == "r": # remove | |
|
854 | if m == "r": # remove (must come first) | |
|
852 | 855 | if branchmerge: |
|
853 | 856 | repo.dirstate.remove(f) |
|
854 | 857 | else: |
|
855 | 858 | repo.dirstate.drop(f) |
|
859 | elif m == "f": # forget (must come first) | |
|
860 | repo.dirstate.drop(f) | |
|
856 | 861 | elif m == "a": # re-add |
|
857 | 862 | if not branchmerge: |
|
858 | 863 | repo.dirstate.add(f) |
|
859 | elif m == "f": # forget | |
|
860 | repo.dirstate.drop(f) | |
|
861 | 864 | elif m == "e": # exec change |
|
862 | 865 | repo.dirstate.normallookup(f) |
|
863 | 866 | elif m == "k": # keep |
@@ -150,8 +150,8 b' Graft out of order, skipping a merge and' | |||
|
150 | 150 | resolving manifests |
|
151 | 151 | branchmerge: True, force: True, partial: False |
|
152 | 152 | ancestor: 4c60f11aa304, local: 6b9e5368ca4e+, remote: 97f8bfe72746 |
|
153 | e: remote is newer -> g | |
|
153 | 154 | b: keep -> k |
|
154 | e: remote is newer -> g | |
|
155 | 155 | getting e |
|
156 | 156 | updating: e 1/1 files (100.00%) |
|
157 | 157 | e |
@@ -160,8 +160,8 b' Graft out of order, skipping a merge and' | |||
|
160 | 160 | resolving manifests |
|
161 | 161 | branchmerge: True, force: True, partial: False |
|
162 | 162 | ancestor: 4c60f11aa304, local: 1905859650ec+, remote: 9c233e8e184d |
|
163 | d: remote is newer -> g | |
|
163 | 164 | b: keep -> k |
|
164 | d: remote is newer -> g | |
|
165 | 165 | e: versions differ -> m |
|
166 | 166 | preserving e for resolve of e |
|
167 | 167 | getting d |
@@ -196,8 +196,8 b' The other way around:' | |||
|
196 | 196 | f2: picking 'get' action |
|
197 | 197 | end of auction |
|
198 | 198 | |
|
199 | f2: remote is newer -> g | |
|
199 | 200 | f1: keep -> k |
|
200 | f2: remote is newer -> g | |
|
201 | 201 | getting f2 |
|
202 | 202 | updating: f2 1/1 files (100.00%) |
|
203 | 203 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
@@ -36,22 +36,22 b'' | |||
|
36 | 36 | resolving manifests |
|
37 | 37 | branchmerge: True, force: False, partial: False |
|
38 | 38 | ancestor: af1939970a1c, local: 044f8520aeeb+, remote: 85c198ef2f6c |
|
39 | a2: divergent renames -> dr | |
|
39 | b2: remote created -> g | |
|
40 | 40 | b: remote moved from a -> m |
|
41 | 41 | preserving a for resolve of b |
|
42 | b2: remote created -> g | |
|
42 | a2: divergent renames -> dr | |
|
43 | 43 | removing a |
|
44 | 44 | getting b2 |
|
45 | 45 | updating: b2 1/3 files (33.33%) |
|
46 |
updating: |
|
|
47 | note: possible conflict - a2 was renamed multiple times to: | |
|
48 | c2 | |
|
49 | b2 | |
|
50 | updating: b 3/3 files (100.00%) | |
|
46 | updating: b 2/3 files (66.67%) | |
|
51 | 47 | picked tool 'internal:merge' for b (binary False symlink False) |
|
52 | 48 | merging a and b to b |
|
53 | 49 | my b@044f8520aeeb+ other b@85c198ef2f6c ancestor a@af1939970a1c |
|
54 | 50 | premerge successful |
|
51 | updating: a2 3/3 files (100.00%) | |
|
52 | note: possible conflict - a2 was renamed multiple times to: | |
|
53 | c2 | |
|
54 | b2 | |
|
55 | 55 | 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
56 | 56 | (branch merge, don't forget to commit) |
|
57 | 57 | |
@@ -181,8 +181,8 b' Check for issue3074' | |||
|
181 | 181 | resolving manifests |
|
182 | 182 | branchmerge: True, force: False, partial: False |
|
183 | 183 | ancestor: 19d7f95df299, local: 0084274f6b67+, remote: 5d32493049f0 |
|
184 | newfile: remote created -> g | |
|
184 | 185 | file: rename and delete -> rd |
|
185 | newfile: remote created -> g | |
|
186 | 186 | getting newfile |
|
187 | 187 | updating: newfile 1/2 files (50.00%) |
|
188 | 188 | updating: file 2/2 files (100.00%) |
@@ -379,20 +379,20 b' m "um a c" "um x c" " " "10 do merg' | |||
|
379 | 379 | resolving manifests |
|
380 | 380 | branchmerge: True, force: False, partial: False |
|
381 | 381 | ancestor: 924404dff337, local: 02963e448370+, remote: fe905ef2c33e |
|
382 | a: divergent renames -> dr | |
|
383 | 382 | c: remote created -> g |
|
384 | 383 | rev: versions differ -> m |
|
385 | 384 | preserving rev for resolve of rev |
|
385 | a: divergent renames -> dr | |
|
386 | 386 | getting c |
|
387 | 387 | updating: c 1/3 files (33.33%) |
|
388 |
updating: |
|
|
388 | updating: rev 2/3 files (66.67%) | |
|
389 | picked tool 'python ../merge' for rev (binary False symlink False) | |
|
390 | merging rev | |
|
391 | my rev@02963e448370+ other rev@fe905ef2c33e ancestor rev@924404dff337 | |
|
392 | updating: a 3/3 files (100.00%) | |
|
389 | 393 | note: possible conflict - a was renamed multiple times to: |
|
390 | 394 | b |
|
391 | 395 | c |
|
392 | updating: rev 3/3 files (100.00%) | |
|
393 | picked tool 'python ../merge' for rev (binary False symlink False) | |
|
394 | merging rev | |
|
395 | my rev@02963e448370+ other rev@fe905ef2c33e ancestor rev@924404dff337 | |
|
396 | 396 | 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
397 | 397 | (branch merge, don't forget to commit) |
|
398 | 398 | -------------- |
@@ -746,9 +746,9 b' m "nm a b" "um x a" " " "22 get a, ' | |||
|
746 | 746 | resolving manifests |
|
747 | 747 | branchmerge: True, force: False, partial: False |
|
748 | 748 | ancestor: 924404dff337, local: 02963e448370+, remote: 2b958612230f |
|
749 | c: remote created -> g | |
|
749 | 750 | b: local copied/moved from a -> m |
|
750 | 751 | preserving b for resolve of b |
|
751 | c: remote created -> g | |
|
752 | 752 | rev: versions differ -> m |
|
753 | 753 | preserving rev for resolve of rev |
|
754 | 754 | getting c |
@@ -836,6 +836,7 b' 8 f (f) f f "remote differs from ' | |||
|
836 | 836 | ancestor: e6cb3cf11019, local: ec44bf929ab5+, remote: c62e34d0b898 |
|
837 | 837 | remote changed 8/f which local deleted |
|
838 | 838 | use (c)hanged version or leave (d)eleted? c |
|
839 | 8/f: prompt recreating -> g | |
|
839 | 840 | 0/f: versions differ -> m |
|
840 | 841 | preserving 0/f for resolve of 0/f |
|
841 | 842 | 1/g: versions differ -> m |
@@ -856,7 +857,6 b' 8 f (f) f f "remote differs from ' | |||
|
856 | 857 | preserving 6/g for resolve of 6/g |
|
857 | 858 | 7/f: remote differs from untracked local -> m |
|
858 | 859 | preserving 7/f for resolve of 7/f |
|
859 | 8/f: prompt recreating -> g | |
|
860 | 860 | removing 4/f |
|
861 | 861 | getting 8/f |
|
862 | 862 | $ hg mani |
@@ -46,9 +46,9 b'' | |||
|
46 | 46 | resolving manifests |
|
47 | 47 | branchmerge: False, force: False, partial: False |
|
48 | 48 | ancestor: c19d34741b0a, local: c19d34741b0a+, remote: 1e71731e6fbb |
|
49 | b: remote created -> g | |
|
49 | 50 | a: versions differ -> m |
|
50 | 51 | preserving a for resolve of a |
|
51 | b: remote created -> g | |
|
52 | 52 | getting b |
|
53 | 53 | updating: b 1/2 files (50.00%) |
|
54 | 54 | updating: a 2/2 files (100.00%) |
@@ -100,9 +100,9 b'' | |||
|
100 | 100 | resolving manifests |
|
101 | 101 | branchmerge: False, force: False, partial: False |
|
102 | 102 | ancestor: c19d34741b0a, local: c19d34741b0a+, remote: 1e71731e6fbb |
|
103 | b: remote created -> g | |
|
103 | 104 | a: versions differ -> m |
|
104 | 105 | preserving a for resolve of a |
|
105 | b: remote created -> g | |
|
106 | 106 | getting b |
|
107 | 107 | updating: b 1/2 files (50.00%) |
|
108 | 108 | updating: a 2/2 files (100.00%) |
General Comments 0
You need to be logged in to leave comments.
Login now