Re: Commit to a branch ?

Hi,

You should be able to create the branch, then 'svn switch' the working
copies to point to that branch without losing your local edits. We have used
this solution before as a method of 'shelving' incomplete or POC work.

Before we do the 'svn switch', we first update the working copy to be based
at the same revision as the source of the branch - not 100% sure of whether
this is necessary or not, but we've found it does eliminate many of the
issues.

For example, if HEAD is r100:

svn update .......
Updated to r100.

svn copy /trunk /branches/new-branch --> gives r101

svn switch ........
svn update .......
svn commit

Cheers,
Daniel B.

On Thu, Apr 2, 2009 at 3:44 AM, thibaut colar <tcolar-groups_at_colar.net>wrote:

> Hello there, I have a subversion issue I'm not sure how to solve.
>
> Here is the scenario:
> 3 different developers worked from a trunk copy(same) and made changes.
> We now want to commit all this, but decided (after the fact, don't ask)
> to commit to a branch (created now from the trunk version we started the
> work on).
>
> Basically I would like to commit the existing working copy changes to
> the branch but can't figure a way to do this (don't think there is a
> 'copy to branch' feature)
> - If we do a "switch copy" to switch to the branch that would loose the
> local working copy changes.
> - If I do a 'svn copy' of the local working copy to the branch, I don't
> think that will work(copy wouldn't know to merge all 3 devs changes right
> ?)
>
> I believe the proper thing to do is probably to merge the working copy
> of each dev to the branch(then switch to it), however i can't quite
> figure the magic incantation do do it
>
> I expected something like this:
> svn merge --dry-run -r 2125:HEAD .
> http://server/svn/branches/somebranch/project1
>
> I first tried without the revision stuff because I use svn 1.5 and
> thought the new merging does not need it.
>
> Anyway if anybody can shade any light, that would be nice.
>
> Thanks.
>
> ------------------------------------------------------
>
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1509292
>
> To unsubscribe from this discussion, e-mail: [
> users-unsubscribe_at_subversion.tigris.org].
>

-- 
---
Daniel Becroft
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1511327
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].