moving file-changes to a branch ...

[Stephan Herschel <St...@biovertis.com>]

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. Can't i just tell subversion to exchange to current revision of the file with the latest revision I have in ./repos/develop? How?

Thanks,
Stephan


---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

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

[Ben Collins-Sussman <su...@collab.net>]

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