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

Re: Request of improvement of the merge preparation

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Sat, 26 Feb 2011 09:50:38 +0100

On 20.02.2011 13:22, Torge Riedel wrote:
> Hi,
>
> everytime I'm using the SVN merge command from TortoiseSVN it shows
> an error that it cannot "merge into mixed" revisions. I need to call
> "SVN Update" (and sometimes "SVN Clean Up") once to be able to merge.
> Would be nice, if this is detected by TortoiseSVN and the user is
> requested if an "SVN Update" should be executed.

What's the exact error message?
And is it really an error? TSVN shows a warning if there are local
modifications before you try to merge, but that's just a warning, not an
error.

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=2707735
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-02-26 09:50:54 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.