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

Re: Problem with branch and merge

From: Johan Appelgren <johan.appelgren_at_gmail.com>
Date: 2005-01-19 15:11:31 CET

On Wed, 19 Jan 2005 15:01:36 +0100, Jacob Atzen <jacob@aub.dk> wrote:
> [snipped a long story]
>
> I see two possible paths:
>
> You could "undo changes" in your trunk. Bringing trunk back to the state
> it was at in 140 and then merge. This is described in:
>
> <http://svnbook.red-bean.com/en/1.1/ch04s04.html#svn-ch-4-sect-4.2>
>
> Or you could simply delete trunk and rename/move your branch and call it
> trunk.
 
Wouldn't 'svn merge $trunk $branch' into a wc of trunk accomplish this as well?

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Jan 19 15:15:01 2005

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