Re: just upgraded to svn 1.5 - confused

2011-04-29 Thread Totte Karlsson
Ff after you re-integrate you merge that rev from trunk with --record-only you can keep using the same branch. But, yes for the most part, "reintegrate" is designed for feature branches which are generally not used/needed after the feature is reintegrated into trunk. I am sometimes using tor

RE: just upgraded to svn 1.5 - confused

2011-04-29 Thread Bob Archer
> On Thu, Apr 28, 2011 at 20:27, Totte Karlsson > wrote: > > Someone said that merges are easy.. I have read the svn book > about merges > > but it does not help. > > > > I create a branch and I can keep it synchronized with the trunk. > > I can even re-integrate the branch with the trunk. > > > >

Re: just upgraded to svn 1.5 - confused

2011-04-28 Thread Totte Karlsson
You will want to read http://svnbook.red-bean.com/nightly/en/svn.branchmerge.advanced.html#svn.branchmerge.advanced.reintegratetwice if you plan on using --reintegrate while keeping the branch around. Thanks! It will save me much time!

Re: just upgraded to svn 1.5 - confused

2011-04-28 Thread Andy Levy
On Thu, Apr 28, 2011 at 20:27, Totte Karlsson wrote: > Someone said that merges are easy.. I have read the svn book about merges > but it does not help. > > I create a branch and I can keep it synchronized with the trunk. > I can even re-integrate the branch with the trunk. > > From now on, it see

just upgraded to svn 1.5 - confused

2011-04-28 Thread Totte Karlsson
Someone said that merges are easy.. I have read the svn book about merges but it does not help. I create a branch and I can keep it synchronized with the trunk. I can even re-integrate the branch with the trunk. From now on, it seems the branch is useless since I can't continue working on it a