Re: trunk client fails during conflict resolution

On Tue, Oct 18, 2016 at 01:42:40PM -0700, Alexey Neyman wrote:
> I just found what made it consider this directory different: it had build
> artifacts (*.o, *.d, etc) in that directory - once I ran 'make clean' prior
> to merge, the merge proceeded smoothly. Does the client consider unversioned
> files when comparing the directories?

I could reproduce this with unversioned artifacts in the directory and
without. It seems accepting the deletion of a directoy was broken in
general. The change I just committed in r1765506 fixes the problem here.
Can you confirm?

Thank you!
Received on 2016-10-18 23:03:04 CEST