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

Re: annoying "Attempt to add tree conflict that already exists"

From: Paul Hammant <paul_at_hammant.org>
Date: Wed, 16 Sep 2009 09:37:27 -0500

> Great work folks, we might be able to make progress. Will report
> back later.

OK, we really like the 1.6.x-latest build, its much more
communicative. However its exposing multiple places where tree
conflicts are happening. We were hoping we could do ..

    cd branch
    cd web
    svn merge -accept theirs-full http://svn/repo/trunk/web .
    cd ../common
    svn merge -accept theirs-full http://svn/repo/trunk/common .
    cd ../data
    svn merge -accept theirs-full http://svn/repo/trunk/data .
    cd ..

.. given we knew that the relatively unimportant file services/foo.xml
was the initial tree conflict.

What we've learned though is that there are tree conflicts all over
the place. Thus, we're going to try some other strategy & report back.

- Paul


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-09-16 16:38:52 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.