Hint: $ svn help merge merge: Apply the differences between two sources to a working copy path.
And please read this before playing with svn merge: http://svnbook.red-bean.com/nightly/en/svn.branchmerge.html Diego Iastrubni wrote: > Hi all, > > This is a SVN question, while still not only "linux" related, I assume this > is > one of the best places to get my question answered. > > Lets say I am working on some package, in trunk. Now, at some point, I want > to > open a new develpment branch, "svn cp trunk branches/tetst1". No problem > here. > > The problem starts when I decide that the development branch should become > the > trunk. How can I tell SVN: > "for get this dir, now trunk is branches/test1". > > one option, is what I did: > open mc: on the left trunk, on the right branches/test1. do the work > manually. > > second option is: > svn rm trunk > svn cp branches/test1 trunk > > I assume both are not perfect. How do you handle such situations...? Any > smarter way...? > -- Lior Kaplan [EMAIL PROTECTED] http://www.Guides.co.il ================================================================= To unsubscribe, send mail to [EMAIL PROTECTED] with the word "unsubscribe" in the message body, e.g., run the command echo unsubscribe | mail [EMAIL PROTECTED]
