On Nov 19, 2009, at 4:02 AM, Yuen-Chi Lian wrote:
> Hi,
>
> I am trying to merge a feature branch to the trunk (with some local
> edit). By doing a dry run, I get:
>
> --- Merging r2267 through r2464 into '.':
> A test/integration-test
> A test/integration-test/src
> A test/integration-test/src/test
> ... (trimmed)
> A test/integration-test/pom.xml
> C test/pom.xml
> C test/pom.xml
> A test/util
> A test/util/pom.xml
> ...
> --- Merging r2267 through r2464 into 'reporting':
> D reporting/src/test/java/itest
> U reporting/pom.xml
>
> However, when I really perform the merge, svn will fail at:
>
> svn: Attempt to add tree conflict that already exists
> svn: Error reading spooled REPORT request response
>
> $ svn st
> C test/pom.xml
>> local edit, incoming delete upon merge
>
> After resolving the conflict and re-run the same merge command, svn will
> re-do the pervious merge (since nothing has gone into svn:mergeinfo
> yet?). So what can I really do to make sure I can proceed with the rest
> of the merges?
The error was due to a bug in early versions of Subversion 1.6.
It has been fixed in 1.6.6.
See issue http://subversion.tigris.org/issues/show_bug.cgi?id=3486
for details.
Regards,
Steve
>
>
> Thanks.
>
> --
> Yuen-Chi Lian | www.yclian.com
> "I do not seek; I find." - Pablo Picasso
>
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2419818
>
> To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Stephen Butler | Software Developer
elego Software Solutions GmbH
Gustav-Meyer-Allee 25 | 13355 Berlin | Germany
fon: +49 30 2345 8696 | mobile: +49 163 25 45 015
fax: +49 30 2345 8695 | http://www.elegosoft.com
Geschäftsführer: Olaf Wagner | Sitz der Gesellschaft: Berlin
Amtsgericht Charlottenburg HRB 77719 | USt-IdNr: DE163214194
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2419925
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-11-19 08:18:24 CET