[Svnmerge] Question about SVN 1.5 vs. svnmerge
Blair Zajac
blair at orcaware.com
Sun Sep 28 13:21:16 PDT 2008
Jon Schewe wrote:
> I've done some reading on the new merge features in svn 1.5 and I'm not
> sure it supports everything that svnmerge does. Perhaps someone on this
> list can either answer the question or point me to an answer.
>
> I'm doing development with development branches. Each developer has
> their own branch they work on (as we don't share bugs much). Each
> developer merges changes from the trunk when they want to get up to date
> and then merges changes back to the trunk when they're done making
> changes (using -b) and then keeps making changes in their development
> branch and does this all over again.
>
> Looking at the svn 1.5 documentation it doesn't appear that this is
> supported as you need to use the reintegrate option and then the branch
> is dead. Is this correct?
That's right. 1.5 also doesn't support blocking revisions expect by munging the
mergeinfo using --record-only.
Regards,
Blair
--
Blair Zajac, Ph.D.
CTO, OrcaWare Technologies
<blair at orcaware.com>
Subversion training, consulting and support
http://www.orcaware.com/svn/
More information about the Svnmerge
mailing list