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

Re: code location related to investigate potential issue in resolve dialog

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Mon, 25 Jul 2016 20:29:00 +0200

On 25.07.2016 16:35, Stefan Hett wrote:
> Hi,
>
> I'm currently trying to debug/trace down the following error I get when
> clicking the "Prefer local" button on TSVN's resolution dialog upon a
> binary file conflict during a merge:
>
> Would you have any hint for me for the location which would be related
> to the produced error message: "Conflict on [...] could not be resolved
> because the chosen version of the file is not available."?
>
> I'd like to trace down what's the cause for that on my machine/in my use
> case to either understand the current behavior or properly report the
> problem to the appropriate list (aka: TSVN or SVN).

That error message is generated in the file
subversion\libsvn_wc\conflicts.c in the svn library, function
build_text_conflict_resolve_items().
https://svn.apache.org/repos/asf/subversion/branches/1.9.x/subversion/libsvn_wc/conflicts.c

When you chose "prefer local" you get the path in the switch-case going
through svn_wc_conflict_choose_mine_conflict - which calls
merge_showing_conflicts(), but that function should set
'install_from_abspath' as well unless there's an error creating the
merge file.
Not sure why you get that error. From a quick view of the code that
shouldn't happen, but it may be something with your setup/merge.

You'll have to ask on the svn mailing list for details about this.

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=3180121
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2016-07-25 20:29:04 CEST

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