Re: Merging from foreign repositories

2011-03-14 Thread Stefan Sperling
On Mon, Mar 14, 2011 at 05:53:04PM +0100, Christoph Bartoschek wrote: > Am Montag, 14. März 2011 schrieb Stefan Sperling: > > 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

Re: Merging from foreign repositories

2011-03-14 Thread Christoph Bartoschek
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 o

Re: Merging from foreign repositories

2011-03-14 Thread 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

Re: Merging from foreign repositories

2011-03-14 Thread Daniel Shahaf
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/d

Re: Merging from foreign repositories

2011-03-14 Thread Christoph Bartoschek
Am Montag, 14. März 2011 schrieb Stefan Sperling: > On Mon, Mar 14, 2011 at 04:08:57PM +0100, Christoph Bartoschek wrote: > > 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

Re: Merging from foreign repositories

2011-03-14 Thread Stefan Sperling
On Mon, Mar 14, 2011 at 04:08:57PM +0100, Christoph Bartoschek wrote: > 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/