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

Re: svn commit: rev 6715 - in branches/neon-0.24

From: <kfogel_at_collab.net>
Date: 2003-08-12 19:38:51 CEST

sergeyli@tigris.org writes:
> Log:
> Merge back from trunk, r 6615:6714 incl.

Sergey, can you describe your plan here? I think "rebranch" means
something different to you than it does to me :-).

You just merged a bunch of changes into trunk. The procedure for
rebranching is:

  1. Delete the current Neon-0.24 branch, since all (or 90%) of those
     changes are in trunk now.

  2. Create a new Neon-0.24 branch, based on the post-merge trunk.

  3. Port any remaining changes from your old Neon-0.24 branch to the
     new one ("remaining" means ones that were not merged into trunk).

There's no point merging changes from branch into trunk, and then
immediately back into the branch again :-)... That doesn't get you
anything.

-Karl

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Aug 12 20:20:11 2003

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.