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

Re: Merging Branch to Trunk takes 20 min for one change

From: Kurt Pruenner <leak_at_gmx.at>
Date: Tue, 13 Oct 2009 10:45:09 +0200

Doug Carson wrote:
> So normally we do not need reintegrate, but our last release required
> major changes that would have 'broken' the product if merged to
> /trunk while in development. So we developed the full release in a
> feature branch and reintegrated it. In case that happened again, I
> just wanted to be clear what should be done. And your instructions
> were perfect.

Ummm... if that's the case, i.e. if the code on the branch is what got
released - why not just throw out the trunk folder and copy the branch
to trunk? Takes approximately no time and makes sure all your released
code ends up where it should...

Kurt Bernhard Pruenner --- Haendelstrasse 17 --- 4020 Linz --- Austria
.......It might be written "Mindfuck", but it's spelt "L-A-I-N".......
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-10-13 23:48:00 CEST

This is an archived mail posted to the TortoiseSVN Users mailing list.