From: Eric Wong Date: Tue, 22 Apr 2014 18:54:59 GMT Subject: Re: [PATCH 2/2] git-svn: only look at the root path for svn:mergeinfo Message-ID: <20140422185459.GA17248@dcvr.yhbt.net> In-Reply-To: <1397717646-54248-2-git-send-email-stoklund@2pi.dk> Jakob Stoklund Olesen wrote: > Subversion can put mergeinfo on any sub-directory to track cherry-picks. > Since cherry-picks are not represented explicitly in git, git-svn should > just ignore it. Hi, was git-svn trying to track cherry-picks as merge before? This changes behavior a bit, so two independent users of git-svn may not have identical histories as a result, correct? Can you add a test to ensure this behavior is preserved? Thanks. Sorry, I've never looked at mergeinfo myself, mainly relying on Sam + tests for this. [1] - Historically, git-svn (using defaults) has always tried to preserve identical histories for independent users across different git-svn versions. However, mergeinfo may be enough of a corner-case where we can make an exception.