Re: [ot] svn branches and tricks

2006-10-02 Thread Marc Volovic
On Monday 02 October 2006 20:30, Diego Iastrubni quoth: > 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". The simplest "way" would be similar to what you suggest as the second option, al

Re: [ot] svn branches and tricks

2006-10-02 Thread Diego Iastrubni
I don't want to merge. Lets say I have some changes on the trunk, that are obsoleted by the new changes comming from the new branch. I will need to read this anyway... :( ביום שני, 2 באוקטובר 2006, 20:30, נכתב על ידי Diego Iastrubni: > Hi all, > > This is a SVN question, while still not only "l

Re: [ot] svn branches and tricks

2006-10-02 Thread Lior Kaplan
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

[ot] svn branches and tricks

2006-10-02 Thread Diego Iastrubni
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 her