Is this still useful: svnmerge.py ?
http://www.orcaware.com/svn/wiki/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:
>>>> CAUTION:
>>>>
>>>> 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