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

Re: [TSVN] Re: Merge dialog

From: Nathan Creek <nathan_at_adweb.com.au>
Date: 2005-01-25 01:07:55 CET

>>If you want to merge two URL's, then you have to specify the revisions
>>with the URL (however, that approach almost always will have the HEAD
>>revision given, so it will default to HEAD and so users won't even
>>bother entering a revision number there anyway).
>
> See comments in an earlier response about the dangers of using HEAD.

I totally agree. I very rarely use HEAD when merging.

I'm curious. What are the most common merges that people do?

My most common merges scenarios are

Scenario 1:
WC is a branch that i want to bring up to date with the trunk.
- Look up WC log and find previous_merge_rev (assuming previous merge
log message is correct)
- Merge into branch WC
   from: trunk@previous_merge_rev
   to: trunk@(click show log and choose latest revision *)
- Commit with appropriate log message.

* I can't just use the Head Revision option because there's no sure way
to tell what revision number was used as head. I need to know for sure
which revision number was used so the i can enter a correct log message.

Scenario 2:
Development in a branch is finished and ready to be merged back into the
trunk.
- If Scenario 1 hasn't been done recently then do it. (better to fix
conflicts and test in the branch than in the trunk)
- Either remember from previous step, or look up the latest merge
revision from the trunk.
- Merge into trunk WC
   from: trunk@previouw_merge_rev
   to: branch@(click to show log and choose latest revision *)
- Commit with appropriate log message.

* Same reason as before.

Cheers,
Nathan

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Tue Jan 25 01:08:40 2005

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