[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: David Huang <khym_at_azeotrope.org>
Date: Wed, 1 Sep 2010 16:34:42 -0500

On Sep 1, 2010, at 4:01 PM, Bob Archer wrote:
> Try the merge command. I guess diff doesn't support it.

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'

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.

-- 
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 34 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=2654315
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-09-01 23:34:57 CEST

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