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