equal
deleted
inserted
replaced
921 ) |
921 ) |
922 else: |
922 else: |
923 mresult.addfile( |
923 mresult.addfile( |
924 f, mergestatemod.ACTION_REMOVE, None, b'other deleted', |
924 f, mergestatemod.ACTION_REMOVE, None, b'other deleted', |
925 ) |
925 ) |
|
926 if branchmerge: |
|
927 # the file must be absent after merging, |
|
928 # howeber the user might make |
|
929 # the file reappear using revert and if they does, |
|
930 # we force create a new node |
|
931 mresult.addcommitinfo( |
|
932 f, b'merge-removal-candidate', b'yes' |
|
933 ) |
|
934 |
926 else: # file not in ancestor, not in remote |
935 else: # file not in ancestor, not in remote |
927 mresult.addfile( |
936 mresult.addfile( |
928 f, |
937 f, |
929 mergestatemod.ACTION_KEEP_NEW, |
938 mergestatemod.ACTION_KEEP_NEW, |
930 None, |
939 None, |
1031 f, |
1040 f, |
1032 mergestatemod.ACTION_KEEP_ABSENT, |
1041 mergestatemod.ACTION_KEEP_ABSENT, |
1033 None, |
1042 None, |
1034 b'local not present, remote unchanged', |
1043 b'local not present, remote unchanged', |
1035 ) |
1044 ) |
|
1045 if branchmerge: |
|
1046 # the file must be absent after merging |
|
1047 # however the user might make |
|
1048 # the file reappear using revert and if they does, |
|
1049 # we force create a new node |
|
1050 mresult.addcommitinfo(f, b'merge-removal-candidate', b'yes') |
1036 |
1051 |
1037 if repo.ui.configbool(b'experimental', b'merge.checkpathconflicts'): |
1052 if repo.ui.configbool(b'experimental', b'merge.checkpathconflicts'): |
1038 # If we are merging, look for path conflicts. |
1053 # If we are merging, look for path conflicts. |
1039 checkpathconflicts(repo, wctx, p2, mresult) |
1054 checkpathconflicts(repo, wctx, p2, mresult) |
1040 |
1055 |