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

Re: Make merge settings available from log view

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Sun, 01 May 2011 17:33:58 +0200

On 27.04.2011 16:54, Ulrich Eckhardt wrote:
> Hi!
>
> There are a few options when merging, namely whether to record only, how to
> handle whitespace and (most important to me) to just test merging. These are
> available from the merge wizard, but not when merging revisions from the log
> view. Are there any plans to make these available or is this even already
> available somewhere?

As you already mentioned, it's available from the merge wizard. I'd like
to keep the "merge revisions to" feature of the log dialog easy, without
another dialog to specify options.

> Alternatively, I'm looking for suggestions how to back out failed merges. My
> scenario here is that I have a bunch of revisions, some of which require some
> manual tweaks. For these, it is easier to manually recreate the according
> changes sometimes, but when I merge them first, I always end up with the
> changes partially committed and either conflict markers or either version.
> What I'm basically looking for is a way to rollback this single revisions, but
> without reverting the working copy and starting again with the first of the
> candidates.

You could merge just the files you want to revert instead of the whole
revision. Or if you want to undo some files manually, do that and then
mark that file in that revision as already merged (merge wizard, "only
record the merge").

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2727604
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-05-01 17:34:12 CEST

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