Am Montag, 14. März 2011 schrieb Stefan Sperling:
> On Mon, Mar 14, 2011 at 05:05:14PM +0100, Christoph Bartoschek wrote:
> > thanks for your suggestion. But the commit that created dirA also created
> > lots of other directories. I am only interessted in dirA.
>
> Then let's just agree that the other stuff added in that commit
> is a merge conflict. So you svn revert -R all of that stuff after
> performing the merge and before committing the merge result.
>
> > I wrote that I want to do this incrementally because I would like to
> > replicate each change in directory dirA of repository A to directory
> > dirB of repository B with a commit hook.
>
> Since you're writing hook scripts, it sounds like you have a way to get
> an incremental dump file of each revision committed to repository A.
> If so, why not load them into repository B using svnadmin load?
>
> svnadmin dump --incremental --deltas -rREV /path/to/reposA > REV.dump
> svnadmin load --parent-dir /branches/fromA /path/to/reposB < REV.dump
>
> > Apparently this does not work with the commit that creates dirA. It seems
> > as if subversion is not able to do this. I will have to do this
> > manually.
>
> You can probably write your hook script to be smart enough to do it.
> But I suppose in your situation the dump/load approach is easier than
> trying to play tricks with merging.
I do not have admin access to repository B. I can only check in into the
parent directory of dirB and below.
Christoph
Received on 2011-03-14 17:53:39 CET