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

login
register
mail settings
Submitter Augie Fackler
Date Sept. 24, 2014, 6:06 p.m.
Message ID <20140924180649.GU13980@arthedain.local>
Download mbox | patch
Permalink /patch/5965/
State Accepted
Commit cc5f94db672bd8ec3cb0b61236ec4b774b4c67ee
Headers show

Comments

Augie Fackler - Sept. 24, 2014, 6:06 p.m.
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:

for me. I'm going to try and figure out how to bisect the behavior
change in git shortly.

Patch

--- /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