On Wed, Sep 16, 2009 at 11:50:11AM -0500, Paul Hammant wrote:
> >> When trying to 'resolved' that one, and optimistically resume the
> >> merge, we're discovering that svn had made multiple items marked as
> >> "! C", not just the first one.
> >
> > Can you please provide more of the actual output you are seeing?
>
> > svn merge -accept theirs-full https://svn/repo/trunk/web .
> [ many successful ]
> G foo/Bar
> svn: Attempt to add tree conflict that already exists at apple/
> banana.xml
> svn: Error reading spooled REPORT request response
>
> > svt st
>
> ! C apple/banana.xml
> ! C apple/grape.xml
> ! C apple/orange.xml
> ! C apple/kiwi.xml
>
> That's more or less what we're seeing.
Is that really all you are seeing?
There should be messages like "local delete, incoming add upon merge"
in the output of 'svn status' which tell you what kind of tree conflict
has happened. This is important important information to figure out
what's going on.
Can you copy/paste the output or redirect it to a file and send that
file as an attachment or paste it into your mail?
> What I'd rather see, is :
>
> > svn merge -accept theirs-full https://svn/repo/trunk/web .
> [ many successful ]
> G foo/Bar
> svn: Attempt to add tree conflict that already exists at apple/
> banana.xml, apple/grape.xml, apple/orange.xml, apple/kiwi.xml
That's not possible, the message is generated for one item at a time.
But yes, it could/should print more of those, possibly.
What I'd like to know now is how exactly do you end up in that state?
I want to know exactly what I need to do to end up in the same state
as you, given an empty repository.
Thanks,
Stefan
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2395658
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-09-16 19:37:51 CEST