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

Problems merging two branches - Subversion 1.3

From: Jonatan Soto <seniledementia_at_gmail.com>
Date: Tue, 26 Apr 2011 18:47:22 +0200

Hi all,

We are facing some problems during a merge process from a branch to trunk (2
URL merge). Note that we didn't synch the branch with the trunk at any time.

We want apply all changes made in that branch back to the trunk but for some
reason the results that are we getting are very odd. Lots of files are not
merged nor added and for some strange reason all conflicts are tree

The command we are using is something like this: svn merge

We know that the --reintegrate option is only available since version 1.5
and perhaps it's the right thing to do, but we cannot upgrade subversion,
it's out of our scope and impossible to accomplish.

May you help us please? Any help would be much appreciated.

Thanks in advance.

Jonatan Soto
Received on 2011-04-26 18:54:33 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.