[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: Russ Brown <pickscrape_at_gmail.com>
Date: 2005-07-09 15:26:33 CEST

Burgess, Glenn wrote:
>>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.
>

That bit of documentation had me confused as well for a while. After
asking a few questions I finally got it clear in my head.

The svk client stores its local data in a depot, which by default lives
in ~/.svk. This depot happens to be a Subversion repository. The svk
client doesn't interact with the repository directly: it checks out
fromk the depot, so in order to be able to use svk with a given
repository, it must first be mirrored in the depot.

What the documentation means is: if you use an svn client to modify the
depot repository directly, it probably will break merge tracking. In
other words: don't mess with what's in ~/.svk.

People can happily commit to the master repository server itself with
svn clients. There is no problem there. Merging should always be done by
svk so that it can maintain the merge tracking properties. There's also
no problem with svn clients creating branches, since that is no
different in svk to svn.

-- 
Russ
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Jul 9 15:28:23 2005

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