RE: resolve conflict dialog is confusing

> On Oct 20, 2011, at 5:36 PM, Bob Archer wrote:
> > Yes and no. It depends on the merge you preform. If you do merge a
> range... the repository path associated to the current working copy is used as
> the SOURE2 of the merge. If you use the command line and do:
> >
> > svn merge ^/MyProject/branches/MyFeature
> >
> > There are two things implied.
> >
> > 1. The target to which the merge diff is applied... which is the pwd,
> > your working copy 2. The source2 of the merge... this is inferred as the svn
> path or URL that the checkout points to.
>
> I suppose you're *technically* correct that the repo associated with the WC
> is used in that case, but that's only due to the "^" shortcut, which doesn't
> work in TSVN (I tried it, and it said "Error:

Yea, I know. Not the point. I could just of well have said:

svn merge http://myserver/myrepo/MyProject/branches/MyFeature

implies SOURCE2 and TARGET from the pwd which is a working copy. You are only specifying SOURCE1 or what TSVN calls "FROM" in its dialogs.

> 'C:\Users\Dave\AppData\Local\Temp' is not a working copy; I assume TSVN's
> current directory was set to the temp dir, rather than my WC dir). However,
> both source1 and source2 of the merge are derived from that path, not just
> source2. SVN merges always need two sources--what you said later about a

No, when you merge in TSVN you select SOURCE1, it is what you put in the "FROM" path in the TSVN dialog. It has nothing to do with the working copy or the working copy's associated svn path.

> merge basically applying the diff between Source1 and Source2 to the WC
> applies to the "svn merge ^/MyProject/branches/MyFeature" case too, not
> only the two-tree merge case. Source1 is basically rev 1 of
> ^/MyProject/branches/MyFeature and source2 is HEAD of
> ^/MyProject/branches/MyFeature.

Yes, I understand there are two sources. I think you missed my point.

BOb

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-10-21 16:00:33 CEST