[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: Bob Archer <Bob.Archer_at_amsi.com>
Date: Thu, 2 Sep 2010 10:50:16 -0400

> I did try a merge; the last error in my previous message was from
> TSVN 1.6.10, Merge two different trees, From:
> http://tortoisesvn.googlecode.com/svn/trunk/ HEAD revision, To:
> http://svn.apache.org/repos/asf/subversion/trunk HEAD revision. A
> Test merge gives the error:
> Error: 'http://tortoisesvn.googlecode.com/svn/trunk' isn't in the
> same repository as
> 'http://svn.apache.org/repos/asf/subversion/trunk'
> If you meant commandline svn, same thing:
> % svn merge --dry-run http://tortoisesvn.googlecode.com/svn/trunk
> http://svn.apache.org/repos/asf/subversion/trunk
> svn: 'http://tortoisesvn.googlecode.com/svn/trunk' isn't in the
> same repository as
> 'http://svn.apache.org/repos/asf/subversion/trunk'

Yes, you are correct. I was thinking that "merge from foreign repositories" allowed for comparing paths in two seperate repos. But, alas that's not supported as you found out. Sorry about that rabbit hole.


> But in any case, the point remains that even if you could diff
> between two repositories, there's not going to be any conflict at
> the point of the diff. The conflicts occur when the diff is applied
> to your local working copy, so the choices for resolving the
> conflict is to use the changes from the repository diff, use the
> changes from the local working copy, or manually pick and choose.
> "Use repository" is unambiguous.

That I 100% agree with.



To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-09-02 16:50:28 CEST

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