Ben Collins-Sussman wrote:
> On Apr 22, 2005, at 2:06 PM, Ingo Adler wrote:
>
>> Subversion isn't very good in handling these kinds of conflicts
>> (renaming or deleting files while other people change it). I started
>> a discussion about this in the dev-mailing list recently, because I
>> have the same problem. The discussion stopped, because they said that
>> they haven't had this problem during their development, so it's not
>> important.
>
> Au contraire, it's very important, and we agreed with that. We just
> didn't believe it was a P1 earthshaking showstopper bug.
> It's so important, in fact, that we have a entire milestone defined
> around the larger problem ("implementing true renames").
> What we're in disagreement about is: design a system for flagging
> tree-conflicts now, or wait for true-renames to be implemented?
When "true renames" are implemented - what's the situation of the second
committer? Wouldn't he have conflicts anyway or would you silently
merge the changes in the new destination? What about deletes?
(I'm impressed how fast you respond - last time even on a Sunday.)
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Apr 22 21:39:01 2005