mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 23:38:50 +03:00
update tests for copy detection changes
This commit is contained in:
parent
fac4139990
commit
9f54c46920
@ -12,9 +12,15 @@ diff --git a/new b/copy
|
||||
copy from new
|
||||
copy to copy
|
||||
% rename
|
||||
diff --git a/copy b/rename
|
||||
rename from copy
|
||||
rename to rename
|
||||
diff --git a/copy b/copy
|
||||
deleted file mode 100644
|
||||
--- a/copy
|
||||
+++ /dev/null
|
||||
@@ -1,1 +0,0 @@
|
||||
-new
|
||||
diff --git a/new b/rename
|
||||
copy from new
|
||||
copy to rename
|
||||
% delete
|
||||
diff --git a/rename b/rename
|
||||
deleted file mode 100644
|
||||
|
@ -17,7 +17,7 @@ summary: 1
|
||||
resolving manifests
|
||||
overwrite False partial False
|
||||
ancestor 33aaa84a386b local 33aaa84a386b+ remote 802f095af299
|
||||
searching for copies back to rev 1
|
||||
searching for copies back to rev 0
|
||||
unmatched files in other:
|
||||
b
|
||||
a: versions differ -> m
|
||||
@ -54,7 +54,7 @@ summary: 1
|
||||
resolving manifests
|
||||
overwrite False partial False
|
||||
ancestor 33aaa84a386b local 33aaa84a386b+ remote 802f095af299
|
||||
searching for copies back to rev 1
|
||||
searching for copies back to rev 0
|
||||
unmatched files in other:
|
||||
b
|
||||
a: versions differ -> m
|
||||
|
Loading…
Reference in New Issue
Block a user