Vladimir Prus <ghost@cs.msu.su> writes:
> > Well, it shouldn't clear an `add' setting, but it should respect that
> > setting and claim a conflict, thus requiring the user to clear the add
> > setting before the update will succeed.
>
> I've probably missed something. Why do you prefer this behaviour?
> Won't be it better to handle this almost like ordinary conflicts: put
> repository version into working copy under fancy name, without
> changing the original one, and then let the user choose whatever
> version he likes. I guess it's not possible to merge them in the usual
> way, because there's no common base, but moving file out of the way is
> inconvenient. I did not like this in CVS.
I am proposing to handle it like ordinary conflicts, as far as
possible. The current behavior is not to report a conflict at all;
that's the bug.
-K
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Sep 12 18:32:05 2002