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

Re: tree conflicts resolution

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Sat, 29 Aug 2009 15:14:18 +0200

On 27.08.2009 14:09, getagrip wrote:
> Tree conflic resolution does not work the same way it did before
> tortoise 1.6.5.
>
> When I rename a file on a /branch and merge this changeset back to
> /trunk I get a tree-conflict in case the file has changed on the trunk
> after the branch has been created.
> In pre-versions of tortoise 1.6.5 I could "edit conflicts" and click on
> "remove the file" or "keep the local file" which does not work anymore.
>
> All I get now is the following message:
>
> "Tree conflicts can only be resolved to 'working state'
> 'path/to/filename' is not resolved."
>
> So I'm stuck as I cannot resolve the conflict without using the command
> line.

Fixed in r17038.

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=2388525
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-08-29 15:14:47 CEST

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