From: "Karl Hasselström" <kha@treskal.com>
To: Yann Dirson <ydirson@altern.org>
Cc: Catalin Marinas <catalin.marinas@gmail.com>,
GIT list <git@vger.kernel.org>
Subject: Re: stg 0.14.3 breakage on push after moving hunk
Date: Thu, 25 Sep 2008 10:37:47 +0200 [thread overview]
Message-ID: <20080925083747.GC27632@diana.vm.bytemark.co.uk> (raw)
In-Reply-To: <20080925075732.GA17458@nan92-1-81-57-214-146.fbx.proxad.net>
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?
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.
--
Karl Hasselström, kha@treskal.com
www.treskal.com/kalle
next prev parent reply other threads:[~2008-09-25 8:16 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-24 23:26 stg 0.14.3 breakage on push after moving hunk Yann Dirson
2008-09-25 7:23 ` Karl Hasselström
2008-09-25 7:57 ` Yann Dirson
2008-09-25 8:37 ` Karl Hasselström [this message]
2008-09-25 18:54 ` Yann Dirson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080925083747.GC27632@diana.vm.bytemark.co.uk \
--to=kha@treskal.com \
--cc=catalin.marinas@gmail.com \
--cc=git@vger.kernel.org \
--cc=ydirson@altern.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox