On Tue, May 20, 2008 at 3:52 PM, Jakub Narebski <jnareb@xxxxxxxxx> wrote: > "Alexander Gladysh" <agladysh@xxxxxxxxx> writes: > >> On Tue, May 20, 2008 at 1:02 PM, Jeff King <peff@xxxxxxxx> 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@xxxxxxxxxxxxxxxxxxxxx> > 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. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
