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

Re: resolve conflict dialog is confusing

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Fri, 14 Oct 2011 23:11:04 +0200

On 14.10.2011 22:56, spongman wrote:
> On Oct 14, 1:52 pm, Andy Levy<andy.l..._at_gmail.com> wrote:
>> Subversion does not support merging between two repositories, so
>> either your understanding or your terminology *is* wrong somewhere
>> along the way here.
>
> i am aware of that. however the working copy has an associated
> repository, and, for me at least, it's not obvious from the wording of
> the dialog that 'repository' does NOT refer to the repository of the
> working copy.

I think you're confusing something here. Unlike DVCS, Subversion does
not have a local repository.

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=2855329
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-10-14 23:11:13 CEST

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.