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

Re: [TSVN] Re: Merging from deleted branch to trunk

From: Mark Phippard <MarkP_at_softlanding.com>
Date: 2005-01-21 01:58:46 CET

> Wheneven i do a merge i make sure i don't have any local changes in my
> WC, do the merge, and then use Check for Mods to see what happened, if
> the merge didn't do what i expected then all i have to do is revert
> everything and try again.

I think this is why dry run is actually useful. Since you can always do a
revert a normal merge is essentially also a preview merge. I use dry-run
for a few reasons:

1) A learning tool. When I am not sure on what URL's/Rev's I want to use
for a merge, for example, do I need to subtract 1 from the rev? Then dry
run is useful as a way to have an idea you did the parms right. For
example, if you get the rev range wrong, you will often get a lot of
conflicts, or no changes at all.

2) Just to sneak a peak. Maybe I am working on a branch for a while, and
I when I get "done" I know I am going to have to merge it. Sometimes I
will use dry-run to get an idea of how many conflicts I am going to have to
deal with. It helps gauge remaining work.

Finally, one problem with the Revert approach is when merge adds files.
Revert undoes the Add, but will never delete the file. So, those files
have to be manually found and deleted so that you can do the merge again.


Scanned for SoftLanding Systems, Inc. by IBM Email Security Management Services powered by MessageLabs.

To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Jan 21 01:59:45 2005

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