Re: [PATCH 2/5] git-svn: Make merge metadata accessible to make_log_entry
- From
Alex Vandiver <alex@chmrr.net>
- Date
- Dec 2, 2009, 20:46 UTC
- Message-ID
- <1259786690-sup-8337@utwig>
- In-Reply-To
- <1259780874-14706-3-git-send-email-alex@chmrr.net>
At Wed Dec 02 14:07:51 -0500 2009, Alex Vandiver wrote:
Show 8 quoted lines
> @@ -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