[PATCH 6 of 6] convert: add support to find git copies from all files in the working copy

Augie Fackler raf at durin42.com
Wed Sep 24 13:06:49 CDT 2014


On Fri, Sep 12, 2014 at 12:48:37PM -0700, Siddharth Agarwal wrote:

<snip most patch content>

> diff --git a/tests/test-convert-git.t b/tests/test-convert-git.t
> --- a/tests/test-convert-git.t
> +++ b/tests/test-convert-git.t
> @@ -277,6 +277,18 @@
>      foo
>    R foo
>
> +  $ cd git-repo2
> +  $ cp bar bar-copied2
> +  $ git add bar-copied2
> +  $ commit -a -m 'copy with no changes'
> +  $ cd ..
> +
> +  $ hg -q convert --config convert.git.similarity=100 \
> +  > --config convert.git.findcopiesharder=1 --datesort git-repo2 fullrepo
> +  $ hg -R fullrepo status -C --change master
> +  A bar-copied2
> +    bar

Exciting developments! Some versions of git cause this test to fail!
Specifically:

--- /usr/local/google/home/augie/Programming/hg/crew/tests/test-convert-git.t
+++ /usr/local/google/home/augie/Programming/hg/crew/tests/test-convert-git.t.err
@@ -287,7 +287,7 @@
   > --config convert.git.findcopiesharder=1 --datesort git-repo2 fullrepo
   $ hg -R fullrepo status -C --change master
   A bar-copied2
-    bar
+    bar-copied


This is against git version 2.1.0.rc2, but git 1.7.x on firefly passes
for me. I'm going to try and figure out how to bisect the behavior
change in git shortly.


More information about the Mercurial-devel mailing list