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

Re: REQ: small change request

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Thu, 07 May 2009 18:34:42 +0200

Dreams wrote:
> I had a minor request about the Tortoise client for Windows. While I
> do most dev on Linux, some things are easier on Windows. Such as
> visual diffs, conflict resolving, etc.
>
> While trying to solve some tree conflicts, in ran into a slight
> inconsistency or confusing dialog box.
> http://dreams.smugmug.com/gallery/3955_WhfMN#530534370_VSFfx
> My misunderstanding comes from the references to 'source left' and
> 'source right', whereas the question I need to answer refers to them
> as "file from repository" and "local file".
>
> Could you please use the same references in both case? I.e. either
> left/right or repo/local?
>
> For some reason I did not see the file contents, hence I do not know
> if left is the local file or the one in the repo. :)

The "source left/right" urls are just for your information about what
svn tried to do, they don't refer to repo/local at all but the merge
sources in the repo (i.e., they're both 'repo', not 'local').

But what would interest me more: how did you get the dialog to only show
", but it was obstructed in the working copy" without an info before
that? There should be an info before that telling you which file is
affected, e.g., "The last XXX operation tried to modify/delete/add/...
the file/directory YYYY".

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=2097324
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].

Received on 2009-05-07 18:35:25 CEST

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