> -----Original Message-----
> From: Stefan Sperling [mailto:stsp_at_elego.de]
> Sent: Tuesday, August 30, 2011 3:59 PM
> To: Rothkin, Steven
> Cc: users_at_subversion.apache.org
> Subject: Re: Merging from main trunk to release branch
>
> On Tue, Aug 30, 2011 at 10:47:38AM -0400, Rothkin, Steven wrote:
> > I'm having some difficulty with merging to release branches that I
> > haven't been able to find a solution for
>
> > svn merge -c 9840 $SVNHVAURL/argus/trunk
>
> This one should work.
[[SDR]]
As I explained it isn't
> Where do run this command?
> It should be run in the root directory of a working copy of
> the release branch.
[[SDR]]
That is where I am running it.
> What version of Subversion is running on the server?
[[SDR]]
I'm currently testing using a local repository on my laptop. I am using
svnserve, version 1.6.16 (r1073529) (which exactly matches the svn
version).
The production server that it will eventually run on is 1.6.9 running
under RedHat linux.
> It needs to be at least 1.5 for merge-tracking to work.
> Also, the repository needs to be upgraded to 1.5 format or later
[[SDR]]
I created the repository by migrating our CVS repository using cvs2svn
version 2.3.0 under Ubuntu linux running inside a VM on my laptop.
> if it was created with an earlier release of Subversion
> (see
http://subversion.apache.org/docs/release-notes/1.5.html#mt-compatibilit
y)
Received on 2011-08-31 02:53:45 CEST