Stefan,
> 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?
>
The result of the merge (sys-out, last few lines) ...
UU foo/one
G foo/two
--- Merging r10889 through r11137 into '.':
GU foo/three
C foo/four
The sys-err from the same merge command ...
svn: Attempt to add tree conflict that already exists at 'foo/nine'
svn: Error reading spooled REPORT request response
The results of svn st ....
[ many other lines ]
MM foo/seven
A + foo/eight
! C foo/nine
> local missing, incoming edit upon merge
! C foo/ten
> local missing, incoming edit upon merge
! C foo/eleven
> local missing, incoming edit upon merge
! C foo/twelve
> local missing, incoming edit upon merge
! C foo/thirteen
> local missing, incoming edit upon merge
! C foo/fourteen
> local missing, incoming edit upon merge
M foo/fifteen
M foo/sixteen
[ many other lines ]
... so yes you're right my grepping had omitted the lines beginning
with ">"
>> 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.
We're contemplating the larger effort of trying to make a reproduction.
- Paul
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2395695
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-09-16 20:41:29 CEST