From: Alex Vandiver <alex@chmrr.net>
To: git <git@vger.kernel.org>
Subject: Re: [PATCH 2/5] git-svn: Make merge metadata accessible to make_log_entry
Date: Wed, 02 Dec 2009 15:46:41 -0500 [thread overview]
Message-ID: <1259786690-sup-8337@utwig> (raw)
In-Reply-To: <1259780874-14706-3-git-send-email-alex@chmrr.net>
At Wed Dec 02 14:07:51 -0500 2009, Alex Vandiver wrote:
> @@ -2944,14 +2944,15 @@ sub find_extra_svk_parents {
> # wahey! we found it, but it might be
> # an old one (!)
> push @known_parents, [ $rev, $commit ];
> + push @known_parents, [ $rev, $path, $commit ];
> }
> }
> }
This hunk is wrong due to a mis-merge on my part -- the first 'push'
line should have been removed, obviously. I'll wait for other
comments before I push a v2, however.
- Alex
--
Networking -- only one letter away from not working
next prev parent reply other threads:[~2009-12-02 20:46 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-02 19:07 [PATCH 0/5] git-svn: svk log message cleanup Alex Vandiver
2009-12-02 19:07 ` [PATCH 1/5] git-svn: Allow setting the committer and author date separately Alex Vandiver
2009-12-02 19:07 ` [PATCH 2/5] git-svn: Make merge metadata accessible to make_log_entry Alex Vandiver
2009-12-02 20:46 ` Alex Vandiver [this message]
2009-12-05 22:32 ` Eric Wong
2009-12-05 22:51 ` Alex Vandiver
2009-12-05 22:59 ` [spf:guess] " Sam Vilain
2009-12-05 23:10 ` Alex Vandiver
2009-12-19 22:24 ` Alex Vandiver
2009-12-02 19:07 ` [PATCH 3/5] git-svn: Strip SVK headers, optionally parsing author information Alex Vandiver
2009-12-02 19:07 ` [PATCH 4/5] git-svn: Provide a default "empty commit message" so the metadata is not the header Alex Vandiver
2009-12-02 19:07 ` [PATCH 5/5] git-svn: Correct a copy-and-pasted misleading comment Alex Vandiver
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=1259786690-sup-8337@utwig \
--to=alex@chmrr.net \
--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.
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 NNTP newsgroup(s).