Christoph Bartoschek wrote on Mon, Mar 14, 2011 at 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? >
svn merge -c 1 file:///path/to/rep/A/ (i.e., for the revision creating the dir, give the parent as the target) > Christoph
