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

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

Re: modify-file within an added tree (r1356317) ; possibly rep-cache.db -related

2012-07-23 Thread Trent Nelson
On Mon, Jul 16, 2012 at 10:39:58AM -0700, Trent Nelson wrote: > > On Jul 16, 2012, at 12:38 PM, Daniel Shahaf wrote: > > > Trent Nelson wrote on Mon, Jul 16, 2012 at 08:58:09 -0700: > >> Somewhat related: is this a FreeBSD box? > > > > Yes, it's eris from http://www.apache.org/dev/machines. > > > >

Re: modify-file within an added tree (r1356317) ; possibly rep-cache.db -related

2012-07-23 Thread Branko Čibej
On 23.07.2012 21:33, Trent Nelson wrote: >> CPU 7 1 instruction cache TSC 991bb5281cc5 >> ADDR 7c3cffe80 >> Instruction cache ECC error >>bit46 = corrected ecc error >>bit62 = error overflow (multiple errors) Oops. >> (P.S. Anyone in the market for a cheap Sun Fire v40z? Very

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

2012-07-23 Thread Daniel Shahaf
Jim Jagielski wrote on Mon, Jul 23, 2012 at 11:55:32 -0400: > Is this still useful: svnmerge.py ? > > http://www.orcaware.com/svn/wiki/Svnmerge.py > For 1.4 repositories (regardless of server software version) yes. I'd not use both svnmerge.py and 'svn merge' on the same branch, that's ju

[PATCH] GDB pretty-printing mergeinfo data structures

2012-07-23 Thread Julian Foad
I've been trying to add GDB pretty-printing support for svn_mergeinfo_t and svn_mergeinfo_catalog_t.  The framework I'm extending is in tools/dev/gdb-py/svndbg/printers.py, created by Hyrum in January, with instructions for use in tools/dev/gdb-py/README. Two problems so far in adding mergeinfo

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