[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: Mon, 12 Oct 2009 14:41:01 -0700 (PDT)

OK, here's what I did:
1. Updated (added) the mergeinfo properties manually to trunk/skin in
WC
2. Merged one revision from /branches/3.1/skin to /trunk/skin (to get
the child properties to elide)
3. Verified that mergeinfo properties were elided on all child nodes
(subfolders and files)
4. Committed that merge to /trunk
5. Merged range of revisions that were ready to merge from branches/
3.1 to /trunk

And the wonderful news is that it worked! I successfully merged all
my latest revisions.

So you have one happy camper here!

> To really understand this I recommend you read this article:
> http://www.open.collab.net/community/subversion/articles/merge-info.html

Yes, I did already read that page and even though I have never used
command line, and a lot of it was over my head, it was still extremely
useful and helped me grasp the logic of the way merge tracking/
mergeinfo works

> Then on the svn list there was a recent topic about mergeinfo elision that really is clear that may help you understand what is happening here:
>
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessa...

That is an excellent post. It should be added to your FAQ as there
seems to be a lot of questions about it.
>
> Also, make sure after you reintegrate a branch you either delete it or do a --record-only merge on the branch from trunk of the rev that was created when you committed the merge into trunk.
>
Now that is a very useful tip which I could not find in the Help File
regarding Merge Reintegrate. In fact, there is very little info on
Record only. To be certain I understand you clearly, is this what I
should do?
1. Merge Reintegrate a feature branch to Trunk
2. On WC of Branch, merge from /trunk - record only
3. Choose the revision # of the merge reintegrate
Does it matter what type of merge I choose? Should I merge using the
branch folder or from root or does it matter?

BTW, I noticed some people use http. We have been using https. Is
there any difference in merge performance between them?

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2406806

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-10-13 23:14:34 CEST

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