From: Yann Dirson Date: Thu, 25 Sep 2008 07:57:32 GMT Subject: Re: stg 0.14.3 breakage on push after moving hunk Message-ID: <20080925075732.GA17458@nan92-1-81-57-214-146.fbx.proxad.net> In-Reply-To: <20080925072322.GA27632@diana.vm.bytemark.co.uk> On Thu, Sep 25, 2008 at 09:23:22AM +0200, Karl Hasselström wrote: > > TypeError: not all arguments converted during string formatting > > No, but try this ... 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 ? Best regards, -- Yann