Re: resolve conflict dialog is confusing

On Oct 19, 2011, at 12:02 PM, spongman wrote:

> On Oct 17, 11:35 pm, Wayne Johnson <wa..._at_zk.com> wrote:
>> it's
>> obvious from at least spongman's comments that there are some real
>> misunderstandings of the what how subversion works, fundamental
>> misunderstandings.
>
> I'm pretty sure I understand quite well how subversion works. Could
> you point to which comments lead you to believe otherwise?

----------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2855302

On Oct 14, 12:49 pm, Dave Huang <k..._at_azeotrope.org> wrote:
> I think the distinction between a working copy and a repository is still clear.

I'm sure you do.

However, for myself and several others who have taken the time to
bring it up, it is definitely not clear.
----------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2855319

> However, when you're doing a merge
> there are two repositories involved (the repository you're merging,
> and the repository associated with the working copy)
----------------------------------------

Earlier you admit that the distinction between a working copy and a repository isn't clear to you. You later clarify that you understand that there's only one repository involved, but that since a working copy is associated with a repository, both can be referred to as a "repository". Your insistence on tying a WC to a repo in the context of a merge operation makes it sound like you don't quite get that the merge destination is the WC, and the repo that's associated with the WC isn't involved at all until you commit (which is not part of the merge).

Recall that we're talking about the conflict dialog that appears *when you do a merge*. Since the subject is merging, it doesn't really make sense to think about the repo that's associated with the WC that you're merging into.

-- 
Name: Dave Huang         |  Mammal, mammal / their names are called /
INet: khym_at_azeotrope.org |  they raise a paw / the bat, the cat /
FurryMUCK: Dahan         |  dolphin and dog / koala bear and hog -- TMBG
Dahan: Hani G Y+C 35 Y++ L+++ W- C++ T++ A+ E+ S++ V++ F- Q+++ P+ B+ PA+ PL++
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2858884
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].