[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Merging from main trunk to release branch

From: Stefan Sperling <stsp_at_elego.de>
Date: Tue, 30 Aug 2011 21:58:35 +0200

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.

Where do run this command?
It should be run in the root directory of a working copy of
the release branch.

What version of Subversion is running on the server?
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
if it was created with an earlier release of Subversion
(see http://subversion.apache.org/docs/release-notes/1.5.html#mt-compatibility)
Received on 2011-08-30 21:59:16 CEST

This is an archived mail posted to the Subversion Users mailing list.