[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [RFC/PATCH] Allow merge to apply only svn:mergeinfo diffs

From: Mark Phippard <markphip_at_gmail.com>
Date: Tue, 27 Oct 2009 08:25:35 -0400

On Thu, Oct 22, 2009 at 1:17 PM, Paul Burba <ptburba_at_gmail.com> wrote:

> Committed r40190.  Only differences between that and the previously
> posted patch are new help text on the --record-only option and a doc
> string tweak for svn_client_merge3().

Something I just thought of ... did you take care not to commit
self-referential mergeinfo when applying these diffs? A common
use-case for --record-only is to use it after a reintegrate merge to
record that revision on the source branch so that you do not have to
delete it.

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2411656
Received on 2009-10-27 13:25:55 CET

This is an archived mail posted to the Subversion Dev mailing list.