Re: git mergetool vs stash apply

From: Alexander Gladysh <agladysh@gmail.com>
Date: May 20, 2008, 12:32 UTC
Message-ID: <c6c947f60805200532h53e7ec64jb846f1d8c1b7066c@mail.gmail.com>
In-Reply-To: <m3prrh42hl.fsf@localhost.localdomain>

On Tue, May 20, 2008 at 3:52 PM, Jakub Narebski <jnareb@gmail.com> wrote:

Show 17 quoted lines

> "Alexander Gladysh" <agladysh@gmail.com> writes:
>
>> On Tue, May 20, 2008 at 1:02 PM, Jeff King <peff@peff.net> wrote:
>>>
>>> So there is perhaps something specific about your setup or your conflict
>>> that is causing mergetool not to work as expected.
>>
>> Most likely so.
>>
>>> Can you give us a test case that fails?
>>
>> No, unfortunately I can not. I was unable to produce a minimal test
>> case, and I can not share the whole repo.
>
> Can you use contents-scrambling tool by Jeff King from
>  Message-ID: <20080510055332.GB11556@sigill.intra.peff.net>
>  http://permalink.gmane.org/gmane.comp.version-control.git/81652

I have some questions:

1. My repo is 650+ MB, my working copy is 350+ KLOC. That size is hard
to share. Would that tool reduce it enough? Is it possible to filter
out irrelevant content somehow?
2. Would that tool obfuscate binaries as well?

Furthermore, I have tried to reproduce that bug once again (by checking out that problematic revision and trying to apply that git stash on it) and was unable to (but my repo has changed since that). Perhaps it was some "moonphase-related" fluctuation...

Sorry for the noise. Alexander.