> -----Original Message-----
> From: Ben Collins-Sussman [mailto:sussman@collab.net]
> Sent: 26. juni 2004 23:56
> To: Casper Hornstrup
> Cc: users@subversion.tigris.org
> Subject: RE: Synchronizing two branches
>
> On Sat, 2004-06-26 at 13:48, Casper Hornstrup wrote:
>
>
> >
> C:\svntest\svncshconsultdk\newrepos\checkin\trunk\reactos>svn
> merge -r
> > 33:HEAD
> > https://svn.csh-consult.dk/reactos/vendor/reactos/20040628/reactos
>
> Um, if HEAD == 33, then you're asking 'svn merge' comparing
> r33 of the vendor branch with r33 of the vendor branch.
> That's not going to produce a patch, since you're comparing
> the same tree with itself. Of course there's no output. :-)
>
> You need to compare two 'snapshots' of the vendor tree: the
> way the vendor branch looked when it was first created, and
> the way it looks now. So you need to compare the revision in
> which the branch was created with HEAD.
Hmm http://svnbook.red-bean.com/svnbook/ch04s04.html#svn-ch-4-sect-4.1
uses the revision from the output of svn log, but maybe it is because
svn copy was used there? I used svn import so the branch didn't exist
in revision 32, so svn merge complains.
C:\svntest\svncshconsultdk\newrepos\checkin\trunk\reactos>svn merge -r 32:HEAD
https://svn.csh-consult.dk/reactos/vendor/reactos/20040628/reactos
svn: REPORT request failed on '/reactos/!svn/vcc/default'
svn:
Invalid editor anchoring; at least one of the input paths is not a directory and
there was no source entry
I should have created the branch directory first using svn mkdir, committed, and
then imported the sources to it or done it completely differently?
Casper
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sun Jun 27 00:22:27 2004