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

[TSVN] I don't understand merge

From: matthew ford <matthew.ford_at_forward.com.au>
Date: 2005-01-22 10:04:35 CET

Hi,
I have noticed some discussion on TSVN merge
Just being a beginner I tried to merge a branch to a trunk and got
completely lost.

How about being able to say merge this URL/revision/Head to the current
Working Copy (as currently modified)
(i.e, right click on WC Merge from... )

This would do for all the merging I can think of.

It is roughly equivalent to checking out the WC and checking out the
URL/revision/Head and then using
BeyondCompare (or some other diff tool) to merge the changes manually

Two tick boxes are need
i) create files/folder that are missing in WC
ii) delete files/folder that have been deleted in URL/rev/Head

At the end there may well be conflicts to sort out but that is another
story.
Then I can check in my WC (once I get it working again after the merge) to
get the result back into SVN
matthew.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Sat Jan 22 10:05:27 2005

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