[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: Sergey A. Lipnevich <sergey_at_optimaltec.com>
Date: 2003-08-12 20:50:46 CEST

kfogel@collab.net wrote:
> 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 :-).
Apparently, sorry about that... I don't remember anything about this in
the HACKING ;-).

> You just merged a bunch of changes into trunk. The procedure for
> rebranching is:
You mean, /from/ the trunk?

> 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.
I think it does, it does steps 2 and 3 for me. I have actually did the
same thing in one step, `merge r X:Y trunk-url' (being in the branch
WC), the way I'm used to in CVS :-) (maybe that was my principal
mistake). Now, I'm not sure if this brings forth any database space
issues, but with a single revision 6715 I have the same result as you
would have, and I saved two revision numbers ;-).
Anyway, I can follow this recommended procedure from now on. I'm just
curious, why steps 1-3 instead of one step? Thank you!

Sergey.

---------------------------------------------------------------------
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:51:33 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.