Re: Commit bug?

Greg Stein <gstein@lyra.org> writes:

> > Imagine you have revision 7 of directory FOO in your working copy.
> > Now you add some props to FOO and commit, thereby creating revision 9.
> >
> > Why revision 9? Because unbeknownst to you, somebody added a new file
> > (BAR) to the directory in revision 8.
>
> That would be a conflict.
>
> If rev 8 was created for an entirely different reason, then my property
> change should go through.

Okay, I agree. It's a bug. :-)

We just have an annoying workaround in place right now, to prevent
disaster. For some reason, our fs merge() routine isn't able to
detect this sort of conflict. I can't remember why.

Still, perhaps we ought to file an issue on this.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Oct 21 14:37:01 2006