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

Syncing a branch with trunk head

From: Alex Kiesel <alex_at_kiesel.name>
Date: 2006-01-06 18:03:06 CET


I am a CVS migrator and I have read quite a bit about the use of the
`svn merge` command. In our project, we're using what the svn book calls
"release branches". Once a project is being release, it's copied to
tags/ and is from then on a stable tag (or branch). We used to use cvs
tags for this before...

I know that I can use `svn merge` to merge all changes made to trunk
into my tag to bring it up to date, but this is not useable here.

A project usually consists of project specific (like language files) and
commonly shared files (like eg. our framework's classes). While language
files tend to get updated often, the common files do not - we know the
current composition in tags is stable and don't want to touch it. Now,
language files get merged often (and they're not shared, so no problem
here). Common files would usually get merged in all together, but it's
almost impossible to get all the revisions correct that I'd have to
merge from.

My question is: is there a simple way, to "copy" what is in trunk's HEAD
(or a specific rev.) into the tag directory, so files that already exist
in tag will have a diff and files that did not yet exist will be a cheap
copy? (I know I can do it with a shell script, but then I always have to
care for local modifications, I'd like to have smth like URL -> WC.)

Thanks in advance,

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Jan 6 18:06:07 2006

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.