##// END OF EJS Templates
salvaged: properly deal with salvaged file during copy tracing...
marmoute -
r46244:ef52dedd default draft
parent child Browse files
Show More
@@ -371,11 +371,15 b' def _merge_copies_dict(minor, major, isa'
371 continue
371 continue
372 # content from "major" wins, unless it is older
372 # content from "major" wins, unless it is older
373 # than the branch point or there is a merge
373 # than the branch point or there is a merge
374 if (
374 if new_tt == other_tt:
375 new_tt == other_tt
375 minor[dest] = value
376 or not isancestor(new_tt, other_tt)
376 elif value[1] is None and dest in changes.salvaged:
377 or dest in changes.merged
377 pass
378 ):
378 elif other[1] is None and dest in changes.salvaged:
379 minor[dest] = value
380 elif not isancestor(new_tt, other_tt):
381 minor[dest] = value
382 elif dest in changes.merged:
379 minor[dest] = value
383 minor[dest] = value
380
384
381
385
@@ -892,15 +892,15 b' copy tracing chain.'
892 o 0 i-0 initial commit: a b h
892 o 0 i-0 initial commit: a b h
893
893
894
894
895 BROKEN: 'a' should be the the source of 'd' in the changeset centric algorithm too
895 'a' is the copy source of 'd'
896
896
897 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mCGm-0")'
897 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mCGm-0")'
898 A d
898 A d
899 a (filelog !)
899 a (no-compatibility !)
900 R a
900 R a
901 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mGCm-0")'
901 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mGCm-0")'
902 A d
902 A d
903 a (filelog !)
903 a (no-compatibility !)
904 R a
904 R a
905 $ hg status --copies --rev 'desc("c-1")' --rev 'desc("mCGm-0")'
905 $ hg status --copies --rev 'desc("c-1")' --rev 'desc("mCGm-0")'
906 A d
906 A d
@@ -955,17 +955,17 b' copy tracing chain.'
955 o 0 i-0 initial commit: a b h
955 o 0 i-0 initial commit: a b h
956
956
957
957
958 BROKEN: 'a' should be the the source of 'd' in the changeset centric algorithm too
958 'a' is the the copy source of 'd'
959
959
960 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mCB-revert-m-0")'
960 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mCB-revert-m-0")'
961 M b
961 M b
962 A d
962 A d
963 a (filelog !)
963 a (no-compatibility !)
964 R a
964 R a
965 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBC-revert-m-0")'
965 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBC-revert-m-0")'
966 M b
966 M b
967 A d
967 A d
968 a (filelog !)
968 a (no-compatibility !)
969 R a
969 R a
970 $ hg status --copies --rev 'desc("c-1")' --rev 'desc("mCB-revert-m-0")'
970 $ hg status --copies --rev 'desc("c-1")' --rev 'desc("mCB-revert-m-0")'
971 M b
971 M b
General Comments 0
You need to be logged in to leave comments. Login now