Subject: Re: When submitting pullups....
To: Pavel Cahyna <pavel@NetBSD.org>
From: Eric Gillespie <epg@NetBSD.org>
Date: 08/31/2007 18:20:20
Pavel Cahyna <pavel@NetBSD.org> writes:
> > Merge-tracking is just about finished, and already being tested
> > by CollabNet's customers and some groups at Google. We've
> > started discussing a 1.5 branch now, and I expect the release
> > within 6 months (normally I'd say 3, but 1.5 is a monster of a
> > release). Subversion will have rock solid merge tracking long
> > before NetBSD switches.
> Is it compatible with SVK which afaik already tracks merges?
No, nor is it compatible with svnmerge.py, another merge-tracking
tool for pre-1.5 Subversion. It should not be too difficult to
transform svk or svnmerge.py properties into the new
svn:mergeinfo properties, though.
Eric Gillespie <*> epg@NetBSD.org