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

Re: Possible bug while committing an added file

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2006-06-28 11:27:49 CEST

On 6/28/06, Ingmar Stieger <papillon@nwnx.org> wrote:
> 1) If I merge changes between two revisions of repository A into my
> working copy of repository B, and files get added to working copy B

You can't do that!
You can't merge from one repository into another. That's why you get
the error message later (that the copy-from url is not from the same

Merging with Subversion means that you keep the history of files.
That's not possible with different repositories, because they have
completely different histories.

You can work around this by
* merge the revisions into a working copy of repository A
* copy the merged files over to the working copy of repository B

* do the merge as you did before
* export the working copy
* revert all changes in the working copy
* copy the exported files back into the working copy
* commit


  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.tigris.org
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Wed Jun 28 11:34:47 2006

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.