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

Re: moving file-changes to a branch ...

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2005-07-05 15:53:25 CEST

On Jul 5, 2005, at 8:42 AM, Stephan Herschel wrote:

> Hi,
>
> I have a simple problem, nevertheless i found no simple solution:
>
> In my repository I have 2 directories:
>
> ./repos/develop ... that's were the all newly developed files go
> ./repos/release/1.0 ... that's our production-release
>
> the contents of ./repos/release/1.0 was done by doing something like
>
> svn cp ./repos/develop ./repos/release/1.0
>
> Now I've got some files in ./repos/release/1.0 that I want to
> update to the latest revision stored in ./repos/develop. Currently
> I do it this way:
>
> svn rm ./repos/release/1.0/file1
> svn commit
> svn cp ./repos/develop/file1 ./repos/release/1.0
> svn commit
>
> I wonder, if there is a better way to do this.

Yes, you would use 'svn merge' to merge whole changesets from develop
to release branch. Read chapter 4 in the book, it describes the
process.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Jul 5 16:00:52 2005

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