On Thu, Sep 25, 2008 at 10:37:47AM +0200, Karl Hasselström wrote: > On 2008-09-25 09:57:32 +0200, Yann Dirson wrote: > > > Thanks, it does fix the exception - I feel a bit ashamed of not > > having looked at the code myself ;) > > :-) > > > Nevertheless, that error was only hiding another more annoying > > problem: > > > > $ ../stgit/stg push > > Checking for changes in the working directory ... done > > Pushing patch "factorize" ... > > Error: File "t/t4030-diff-rename-factorize.sh" added in both, permissions conflict > > Error: The merge failed during "push". > > Use "refresh" after fixing the conflicts or revert the operation with "push --undo". > > stg push: GIT index merging failed (possible conflicts) > > $ md5sum t/t4030-diff-rename-factorize.sh* > > cc313acd2824036556128b3e0879dd07 t/t4030-diff-rename-factorize.sh > > cc313acd2824036556128b3e0879dd07 t/t4030-diff-rename-factorize.sh.current > > cc313acd2824036556128b3e0879dd07 t/t4030-diff-rename-factorize.sh.patched > > > > AFAICT, adding the same file in 2 branches used not to produce a > > conflict at all. Is that intended ? > > "permissions conflict" sounds like it was added with the exec bit in > one branch, and without in the other. Is that right? And > 1. Does it work if there's no permissions conflict? Doh. Sure, it does work, and as expected. Some days really deserve to be spent sleeping :} > 2. Did it work before if there was a permissions conflict? > > Just a guess, but it's entirely plausible that this case never worked, > and you're the first to hit it. I is also entirely plausible that I lacked sleep enough not to read correctly what was printed, and that the behaviour was indeed correct :> The problem is mostly a limitation of the way stg-fold-files-from works, relying on patchutils which do not know about git extensions to the diff format. And since I mostly used it in the past on a git-cvsimport'ed tree, permissions never bothered me. Best regards, -- Yann -- 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
