[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: Doug Carson <dcarson108_at_gmail.com>
Date: Tue, 13 Oct 2009 00:55:21 -0700 (PDT)

Sorry, did not see your post before posting the last one.

(The help basically tells you to delete the branch after you
reintegrate.) Yes it does! But we were keeping it as a tag release.
Probably not the correct way to do that either! So, in future we will
delete the branch after reintegrating. I will read up on the proper
way to create a tag release.

"Don't forget step 0, merge any trunk changes into your feature branch
first. But after than yes, you've got the basic steps."

Yes, I didn't mention step 0 because as you correctly surmised, we
don't merge from trunk to branch. We use a similar basic use case, we
do all development and fixes in branch and only merge to trunk when
approved. Trunk is our release source and once a release is done, we
create a tag/copy/snapshot of trunk. 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.

"One thing that was mentioned recently on the svn list was someone who
has a merge that took an hour. He changed to the svn protocol and it
took a few minutes. I think he found that he had HttpKeepAlives set to
off which was adding ALOT of overhead to the merge since it makes alot
of connections to the server."

We are using Google Code Project Hosting. I am not running in a LAN
or Server environment, and I have never turned HttpKeepAlives off
afaik! Does that even apply in our case?


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-10-14 00:04:35 CEST

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