Re: Problem with branch and merge

[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.

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