Show More
@@ -858,7 +858,7 b' def manifestmerge(repo, wctx, p2, pa, br' | |||
|
858 | 858 | pass # we'll deal with it on m2 side |
|
859 | 859 | elif f in movewithdir: # directory rename, move local |
|
860 | 860 | f2 = movewithdir[f] |
|
861 |
if |
|
|
861 | if f2 in m2: | |
|
862 | 862 | actions[f2] = ('m', (f, f2, None, True, pa.node()), |
|
863 | 863 | "remote directory rename, both created") |
|
864 | 864 | else: |
@@ -887,7 +887,7 b' def manifestmerge(repo, wctx, p2, pa, br' | |||
|
887 | 887 | pass # we'll deal with it on m1 side |
|
888 | 888 | elif f in movewithdir: |
|
889 | 889 | f2 = movewithdir[f] |
|
890 |
if |
|
|
890 | if f2 in m1: | |
|
891 | 891 | actions[f2] = ('m', (f2, f, None, False, pa.node()), |
|
892 | 892 | "local directory rename, both created") |
|
893 | 893 | else: |
@@ -895,7 +895,7 b' def manifestmerge(repo, wctx, p2, pa, br' | |||
|
895 | 895 | "local directory rename - get from " + f) |
|
896 | 896 | elif f in copy: |
|
897 | 897 | f2 = copy[f] |
|
898 |
if |
|
|
898 | if f2 in m2: | |
|
899 | 899 | actions[f] = ('m', (f2, f, f2, False, pa.node()), |
|
900 | 900 | "remote copied from " + f2) |
|
901 | 901 | else: |
@@ -927,7 +927,7 b' def manifestmerge(repo, wctx, p2, pa, br' | |||
|
927 | 927 | # new file added in a directory that was moved |
|
928 | 928 | df = dirmove[d] + f[len(d):] |
|
929 | 929 | break |
|
930 |
if |
|
|
930 | if df is not None and df in m1: | |
|
931 | 931 | actions[df] = ('m', (df, f, f, False, pa.node()), |
|
932 | 932 | "local directory rename - respect move from " + f) |
|
933 | 933 | elif acceptremote: |
General Comments 0
You need to be logged in to leave comments.
Login now