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

Commit to a branch ?

From: thibaut colar <tcolar-groups_at_colar.net>
Date: Wed, 01 Apr 2009 10:44:04 -0700

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 .

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.



To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-04-01 19:48:59 CEST

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