[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: Branching Strategy and upcoming options.....

From: Burgess, Glenn <Glenn.Burgess_at_dsto.defence.gov.au>
Date: 2005-07-07 07:07:44 CEST

>The other option is to use SVK to manage your branches. As
>long as only SVK does the actual merging, you can continue to
>use svn clients for everything else if you so desire.

Well, it's not quite that simple. See http://svk.elixus.org/?SVKFAQ for more details.

"Committing anything to mirrored paths with svn will break the mirror, and merging with svn merge will cause subsequent svk smerge to lose merge history, resulting in possible duplicate merges"
But, if you "create a local branch then you can use svn clients for committing there, and use svk to push and pull."

Hmm, that sounds better than I remembered, I might have to try it again.

>SVK does the merge tracking for you, so you can push and pull
>changes between branches without having to remember revision
>numbers or worry about the same changes being applied more than once.

Glenn.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Jul 7 07:13:14 2005

This is an archived mail posted to the Subversion Users mailing list.