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

Merging from foreign repositories

From: Christoph Bartoschek <bartoschek_at_or.uni-bonn.de>
Date: Mon, 14 Mar 2011 16:08:57 +0100

Hi,

I would like to merge all changes in a directory from repository A to a
directory in repository B.

My idea was to do a loop over all iterations and merge them to dirB:

svn merge -c rev file:///path/to/rep/A/dirA dirB

My problem is that for the revision where dirA is created in repositoryA
nothing is done. The next revision then fails because it misses a directory:

$ svn merge -r 0:1 file:///path/to/rep/A/dirA .
$ svn merge -r 1:2 file:///path/to/rep/A/dirA .
--- Merging (from foreign repository) r2 into '.':
   C utils
Summary of conflicts:
  Tree conflicts: 1

You see that the first command does nothing although dirA and lots of subdirs
were created in revision 1.

How can this be fixed?

Christoph
Received on 2011-03-14 16:09:34 CET

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

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