[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:54:13 +0200

2008-10-13 18:50:37 Daniel Shahaf napisał(a):
> Arfrever Frehtes Taifersar Arahesis wrote on Mon, 13 Oct 2008 at 18:23 +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.
>
> Ouch, did you set it manually on all these dirs or did you use
> 'svn merge --record-only'?

I used 'svn merge --record-only'.

> If you manually fix the mergeinfo, please say that explicitly in the log
> message. Our repos' mergeinfo is complicated enough without undocumented[1]
> merges kicking in. Thanks.

OK. I will update svn:log.

> With that change (achieved by 'svn merge --record-only'), the output is:
>
> U tools\dist\post-to-tigris.py
> A tools\buildbot\slaves\win32-xp-VS2005
> A tools\buildbot\slaves\win32-xp-VS2005\do_all.bat
> A tools\buildbot\slaves\win32-xp-VS2005\svncheck.bat
> A tools\buildbot\slaves\win32-xp-VS2005\config.bat
> A tools\buildbot\slaves\win32-xp-VS2005\svnbuild.bat
> A tools\buildbot\slaves\win32-xp-VS2005\svnlog.bat
> A tools\buildbot\slaves\win32-xp-VS2005\svnclean.bat
> ..\..\..\subversion\libsvn_fs_fs\tree.c:661: (apr_err=160013)
> svn: File not found: revision 33615, path '/branches/svnpatch-diff/tools/buildbot/slaves/win32-xp-VS2005'
>
> Daniel
>
> [1] "undocumented": not shown in the commit mails, in viewvc, or in the log message.

-- 
Arfrever Frehtes Taifersar Arahesis

Received on 2008-10-13 18:57:32 CEST

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