\ wrote:
> I made local mods to a dir-prop in my working copy. I then merged changes
> from trunk into the same working copy, before commit. As you see below,
merge
> indicates only updates for all nodes. Subsequent commit fails due to
> conflicted state of directory node. Merge should have somehow indicated
> directory node conflict. (" C"?)
>
> Searching the issue tracker, I found #1957 which includes in its
description:
> "[merge is] giving no indication that there is a conflicted state here
until
> the user runs 'svn st'." I'm intuiting that these 2 issues are related -
> both are instances of merge not reporting a state of conflict. So my
> question is, does my issue fall under issue #1957, or should I file a
> separate issue in the tracker?
Thankyou for the report!
It does seem rather similar, doesn't it?
I'm filing the text of your email into 1957, as I don't think it'll be
possible to tell for sure whether they are related without almost completely
debugging 1957.
Add yourself to the CC list on 1957 if you want to receive email about the
progress of this bug.
Max.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sun Aug 15 04:08:11 2004