diff tests/test-copies-chain-merge.t @ 45670:a8fb29b05f92

salvaged: properly deal with salvaged file during copy tracing

When salvaged files are encountered, the removal have been reverted and we
should keep the rename information from the other side.

The conditional was starting to be quite hairy, so we spell it out in multiple
elif case for readability.

This fixes the associated test cases introduced a while back. The changeset centric copy tracing is now (known) bug free.

Differential Revision: https://phab.mercurial-scm.org/D9130

--- a/tests/test-copies-chain-merge.t	Tue Sep 15 10:55:17 2020 +0200
+++ b/tests/test-copies-chain-merge.t	Wed Sep 16 21:00:02 2020 +0200
@@ -892,15 +892,15 @@
   o  0 i-0 initial commit: a b h
   
 
-BROKEN: 'a' should be the the source of 'd' in the changeset centric algorithm too
+'a' is the copy source of 'd'
 
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mCGm-0")'
   A d
-    a (filelog !)
+    a (no-compatibility !)
   R a
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mGCm-0")'
   A d
-    a (filelog !)
+    a (no-compatibility !)
   R a
   $ hg status --copies --rev 'desc("c-1")' --rev 'desc("mCGm-0")'
   A d
@@ -955,17 +955,17 @@
   o  0 i-0 initial commit: a b h
   
 
-BROKEN: 'a' should be the the source of 'd' in the changeset centric algorithm too
+'a' is the the copy source of 'd'
 
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mCB-revert-m-0")'
   M b
   A d
-    a (filelog !)
+    a (no-compatibility !)
   R a
   $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBC-revert-m-0")'
   M b
   A d
-    a (filelog !)
+    a (no-compatibility !)
   R a
   $ hg status --copies --rev 'desc("c-1")' --rev 'desc("mCB-revert-m-0")'
   M b