svnmerge.py (Was: Re: mergeinfo ignorance)

2012-07-23 Thread Jim Jagielski 
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

Re: svnmerge.py (Was: Re: mergeinfo ignorance)

2012-07-23 Thread Rainer Jung 

On 23.07.2012 17:55, Jim Jagielski wrote:

Is this still useful: svnmerge.py ?

http://www.orcaware.com/svn/wiki/Svnmerge.py


A quick check of

http://svn.apache.org/viewvc/subversion/trunk/contrib/client-side/svnmerge/

and the mailing list activity suggests, that there isn't much going on 
for the tools since about 2009.


There's a user post asking for differences to svn merge at

http://www.orcaware.com/pipermail/svnmerge/2011-May/002144.html

So it seems it only has limited use nowadays.

The tools seems to go back to very early svn days. svn merge isn't too 
bad IMHO. But YMMV.


Regards,

Rainer

Re: svnmerge.py (Was: Re: mergeinfo ignorance)

2012-07-23 Thread Blair Zajac 

On 07/23/2012 08:55 AM, Jim Jagielski wrote:

Is this still useful: svnmerge.py ?

http://www.orcaware.com/svn/wiki/Svnmerge.py


It still gets occasional usage and people occasionally ask questions 
about it (such as today) but I recommend people switch to svn's builtin 
merge tracking if they are running svn 1.6 or later.


Blair