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

Re: Merging fails on the svnpatch-diff branch (and unrelated tree-conflicts error)

From: Arfrever Frehtes Taifersar Arahesis <arfrever.fta_at_gmail.com>
Date: Mon, 13 Oct 2008 18:23:48 +0200

2008-10-13 10:54:41 Daniel Shahaf napisaƂ(a):
> By the way, when I tried the same merge into a wc of the branch @r33608
> (before Arfrever's merge at r33609), I got a few hundred lines of conflicts
> and tree-conflicts, and also a tree-conflicts error at the end ("Attempt to
> add tree conflict that already exists", IIRC).

svn:merginfo was partially incorrect, so I recorded '/trunk:r25664-28216' in
svn:mergeinfo on '.', 'build.conf', 'subversion/include', 'subversion/libsvn_subr'
and 'subversion/tests/libsvn_subr' before merging.

-- 
Arfrever Frehtes Taifersar Arahesis

Received on 2008-10-13 18:28:06 CEST

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