[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

svn merge

From: <johny5.coder_at_gmail.com>
Date: 2007-06-01 08:22:39 CEST

Hello to all.

Im using TortoiseSVN 1.4.3, Build 8645 - 32 Bit , 2007/02/04 09:40:57

Due to security issues, we are using 2 different repositories.
And sometimes I need to merge some changes of one repository to
another one. So, I making merge command like this:

From: URL1, Revision 478, "Ignore ancestry" unmarked
To: "Use "From:" URL" marked, HEAD Revision

The result of the merge is stored in the working copy...
   Another repository local dir
which points to
   URL2 of another repository

Then I press merge. (Diff & Unified diff couldn't help me, because
they are not process add/del files & binary files).

So, everything work perfect, updating, deleting, but when it tries to
add the file it writes error:

Error: Copyfrom-url
'https://...URL1/party_logic/party_update_tracker.h' has different
repository root than

'https://...URL2'

I tried to mark "Ignore ancestry" mark but it haven't helped.
So, what I should do, why it is wrong?

As another hint: currently we are using https://opensvn.csie.org servers.

Thanks, Evgeny.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Fri Jun 1 08:23:08 2007

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