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

On Tue, Oct 27, 2009 at 9:37 AM, Paul Burba <ptburba_at_gmail.com> wrote:
> On Tue, Oct 27, 2009 at 8:25 AM, Mark Phippard <markphip_at_gmail.com> wrote:
>> 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.
>
> This should not be a problem.  Since we actually are doing an editor
> drive, all the code that normally prevents self-referential mergeinfo
> during a "normal" merge is still used.  For example (using
> trunk_at_40230):

Great. I figured you'd have taken care of it. Just wanted to be sure.

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2411671