From: Jakub Narebski <jnareb@gmail.com>
To: git@vger.kernel.org
Subject: Re: How to resolve git-am conflict (possible bug)
Date: Sat, 12 Aug 2006 11:10:40 +0200 [thread overview]
Message-ID: <ebk5tf$31k$1@sea.gmane.org> (raw)
In-Reply-To: 7vslk2rbq8.fsf@assigned-by-dhcp.cox.net
Junio C Hamano wrote:
> Jakub Narebski <jnareb@gmail.com> writes:
>
>> Third, I wonder why it printed the same error message _twice_.
>
> Do you have blob 7ea52b1? Otherwise you would not see two "does
> not apply" messages, so I suspect you do. Does the patch
> cleanly apply to that blob?
>
> More likely explanation is that you edited the patch by hand for
> some reason, and made it inapplicable to the base blob the
> "index" line records.
Yes, I have edited "post-sub-rename" patch by hand (by script) in attempt
for it to apply cleanly to the top of "pre-sub-rename" development branch.
BTW patch applies cleanly to merge-base of the branch the patch is from and
the branch it is applied to.
Why do we not record commit id in patch? And how git-rebase deals with this?
> The first "patch does not apply" comes from ll. 363 of git-am.
> After it fails because the patch does not apply to the version
> of gitweb.perl in your index, since you told it to fall back to
> three-way merge, l. 391 calls fall_back_3way, which inspects the
> patch, finds the "index" line and notices that the patch claims
> to apply to blob 7ea52b1, finds the blob in your repository, and
> prepares a temporary index with "update-index -z --index-info"
> on l. 58 successfully, tries to apply the patch again on l. 63.
>
> However, the patch contents and the blob object name recorded on
> the index line are not necessarily consistent if you hand edited
> the patch (IOW, the context lines in the patch contents may not
> match blob 7ea52b1).
It would be nice then if git-am was more verbose, for example
"Applying patch to blob 7ea52b1... gitweb/gitweb.perl" or something
like that.
And first complaint still apply: in git-am(1) there is precious few
documentation (or at least references) about _how_ to resolve merge
conflict or failed patch (does git-apply creates *.orig and *.rej
files?)
--
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git
next prev parent reply other threads:[~2006-08-12 9:10 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-08-12 0:30 How to resolve git-am conflict (possible bug) Jakub Narebski
2006-08-12 1:01 ` Junio C Hamano
2006-08-12 1:20 ` Junio C Hamano
2006-08-12 9:10 ` Jakub Narebski [this message]
2006-08-12 9:18 ` Jakub Narebski
2006-08-12 19:49 ` Junio C Hamano
2006-08-12 9:52 ` Johannes Schindelin
2006-08-12 19:49 ` Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='ebk5tf$31k$1@sea.gmane.org' \
--to=jnareb@gmail.com \
--cc=git@vger.kernel.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).