[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 15:59:42 -0500

On Sep 1, 2010, at 3:48 PM, Bob Archer wrote:
> So, you can merge the diffs between the paths of two different repositories. I don't recall when it was added that you can diff separate repos... but I think it has been doable since some time after 1.5.

Hmm, it doesn't work for me in the commandline svn:

% svn --version
svn, version 1.6.5 (r38866)
[ ... ]
% svn diff http://tortoisesvn.googlecode.com/svn/trunk/build.txt http://svn.apache.org/repos/asf/subversion/trunk/README
svn: 'http://tortoisesvn.googlecode.com/svn/trunk/build.txt' isn't in the same repository as 'http://svn.apache.org/repos/asf'

But you're right that with TSVN, I can "Diff with URL" a file in my working copy from one repository against a file in another repository. I don't actually know how to diff two URLs with TSVN (without needing a working copy at all)... there doesn't seem to be a "Diff with URL" option in the TSVN Repo browser.

That said, a Tree merge with the "From" and "To" from separate repositories doesn't work in TSVN either; you get the same

Error: 'http://tortoisesvn.googlecode.com/svn/trunk' isn't in the same repository as 'http://svn.apache.org/repos/asf/subversion/trunk'

-- 
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=2654283
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-09-01 22:59:52 CEST

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