RE: Merging Branch to Trunk takes 20 min for one change
From: Bob Archer <bob.archer_at_amsi.com>
Date: Mon, 12 Oct 2009 18:03:19 -0400
> OK, here's what I did:
(The help basically tells you to delete the branch after you reintegrate.)
Don't forget step 0, merge any trunk changes into your feature branch first. But after than yes, you've got the basic steps.
To answer your question:
You should merge into the branch that you just reintegrated from. What you want to happen is let's assume you just reintegrated from /branches/3.1 to /trunk/skin and you commit your merge to trunk and that commit is r1234. You now right click on your /branches/3.1 WC and choose merge. Select regular merge and select /trunk/silk from the repo browser. Specify r1234 and check tell it record only.
What you should see is a mergeinfo record added to /branches/3.1 of something like /trunk/silk r1234 ... If that is correct commit it. You have basically told svn that /branches/3.1 includes all the changes in rev 1234 of /trunk/silk so the next time you do a merge from trunk, it won't include those revs.
Of course, your use case could be that you are NOT merging from trunk into your branch. If this is the case then you won't be doing reintegration's anyway. That is our basic use case. We dev from trunk and create a release branch. So, we never merge from trunk to our branches, only from the branches back into trunk assuming we fixed and issue on the release branch and want it to go back to trunk.
> BTW, I noticed some people use http. We have been using https. Is
I don't think it would make a big difference. But, if you are in a LAN you don't really need to use SSL.
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.
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
This is an archived mail posted to the TortoiseSVN Users mailing list.