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

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".......
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2406987
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].