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

Re: A special use-case using subversion

From: John Peacock <john.peacock_at_havurah-software.org>
Date: Wed, 14 May 2008 12:37:40 -0400

Ilyes Gouta wrote:
> But I'm still a bit worried by the merge details. SVK seems to be
> exactly what we need, but as a package it doesn't have the visibility
> other VCSs have...

FWIW, SVK handles vendor branches without breaking a sweat. In fact, I
have mirrors of multiple different projects that I have occasion to work
on (including Subversion itself) and updating my local branch is usually
as simple as:

        $ svk pull

(from within a working copy of my local branch). This retrieves all of
the updates from the mirror, commits it to the local mirror, then merges
those changes to the local branch. If there is a conflict during the
merge (which is always possible), I've got SVK set to popup a graphical
merge editor (kdiff3 or meld), so it hardly takes any time at all.

The one caveat I will mention is that if someone renames a file and
changes it in a single commit in Subversion, then SVK can get confused
when trying to merge to the local branch. To resolve this, I merely
have to perform the rename in my local branch and commit it. After
that, the merge from upstream can proceed automatically.

Plus, the SVK repository is an ordinary Subversion repository, so
technically you can host that internally using normal Subversion
server/clients (be sure to never commit directly to the mirrored paths


To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-05-14 18:38:11 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.