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

Deciphering merge 'Tree Conflict' dialog

From: Stephen Oberholtzer <stevie_at_qrpff.net>
Date: Wed, 5 Nov 2014 15:34:19 -0500

I'm trying to bring a long-standing feature branch up to date from trunk,
but I'm getting conflicts.

I did this:
(1) Navigated Explorer to WC root
(2) Right-clicked, chose TortoiseSVN->Merge
(3) Merge a range of revisions, [Next]
(4) URL = trunk, range = 'specific range', revision list blank/empty [Next]
(5) [Merge]

and at some point I get a dialog box that looks roughly like this:

=== - Edit Tree Conflicts - TortoiseSVN ======
The last merge operation tried to add the file '', but the file was
obstructed in the working copy.

Source Left: https://<host>/<repo>/trunk/data/afile.txt_at_725
Source Right: https://<host>/<repo>/trunk/data/afile.txt_at_1211
====================================

That first line was not sanitized -- it literally says "add the file ''"
with nothing inside the single-quotes. (I double-checked with Spy++ and
copied the text straight out of the Static control.)

The problem is: I have no idea what this is actually trying to tell me.
The documentation at
http://tortoisesvn.net/docs/release/TortoiseSVN_en/tsvn-dug-conflicts.html
uses the exact same wording as the native SVN client ("local X, incoming
Y") but that's not the wording that shows up on my screen, and I'm not sure
how to do the appropriate translation.

What exactly is this dialog telling me?

-- 
-- Stevie-O
Real programmers use COPY CON PROGRAM.EXE
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3090913
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2014-11-05 22:33:12 CET

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