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

svnmerge.py (Was: Re: mergeinfo ignorance)

From: Jim Jagielski <jim_at_jaguNET.com>
Date: Mon, 23 Jul 2012 11:55:32 -0400

Is this still useful: svnmerge.py ?


On Jul 23, 2012, at 8:45 AM, Jim Jagielski wrote:

> I for sure don't use 'svn merge' and am likely guilty (and the
> orig post clearly indicates) of this... For awhile, svn merge
> was as wonky as hell, so I simply skipped using it and instead
> used the svn.merge script which, for the curious, does a simple
> diff and patch.
> I'm guessing that things are better now ;)
> On Jul 22, 2012, at 12:12 PM, Rainer Jung wrote:
>> On 22.07.2012 16:59, Eric Covener wrote:
>>>> Always merge into a clean branch checkout and commit the whole branch. If
>>>> you start to only commit parts of the branch after merging, svn will produce
>>>> additional mergeinfo properties attached to sub directories or files. We
>>>> don't want that.
>>> I might be a culprit here, I use someones svn.merge script in a not so
>>> clean checkout but then checkin individual files. Will work on it.
>> No culprit. At least in 2.4.x there is currently only one mergeinfo, all is fine :)
>> Regards,
>> Rainer
Received on 2012-07-23 17:56:11 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.