[Monotone-devel] Re: bug in changesets branch?

[graydon hoare]

Bruce Stephens wrote:
> I did this kind of thing (inadvertently).  In brief, I had the same
> branch checked out twice, and committed changes on both.  In one I
> added a directory and some files.  Merging worked (as expected), but
> it seems update doesn't.  I'd have thought it should.  (I've stripped
> out some output that I think is irrelevant.)

thanks for isolating this; it was a small but significant 2-line change 
to the update function which moves directories around. I've fixed it and 
added a regression test, on the changeset branch.

-graydon