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

Re: Question regarding merging branches

From: Dylan Cuthbert <dylan_at_q-games.com>
Date: 2002-09-09 03:22:07 CEST

"Colin D Bennett" <cbennett@radsoft.com> wrote in message
news:200209071832.39565.cbennett@radsoft.com...
> Currently Subversion does not have direct support for keeping a branch in
sync
> with it's branch point (IOW, automated merging of changes to trunk into
your
> branch). This will be added soon enough, and we will use it when it does
come
> around. In order to merge changes from trunk into your branch:

Is this info in the SVN handbook?

This is what I was assuming was working I think - from a user's point of
view the current merge requires too much pre-requisite information that
should be easily enough taken from the file/directory itself. ie. the last
known common branch point between two files.

Or isn't it that easy with subversion? What if I svn copy a file from that
branch into my trunk before merging, and then modify that file. Now when I
merge, the "-r rev1:rev2" won't work will it? I have to know the files I
have svn copied or moved from elsewhere and merge them all separately? It
seems to me that subversion should be able to find and merge files based on
their common branch points quite easily, but then again I've only briefly
skimmed the technicalities of how subversion works internally.

Regards

--
---------------------------------
Q-Games, Dylan Cuthbert.
http://www.q-games.com
P2P internet radio - http://www.peercast.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Sep 9 03:25:42 2002

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