On 02/24/2011 01:32 PM, Julian Foad wrote: >> So mkdir should fail or remove the file from the changelist. > > Yes. The "changelist" concept is simply not designed to support tree > changes and as a consequence we decided it didn't make sense for it to > support directories. We can't do anything clever here: we have to > accept this limitation (unless/until we redesign the "changelist" > concept). > >> What about merge? It can replace a file with a directory. If the file >> has local mods then a tree conflict arises: > > If we choose to remove the changelist association rather than bail out, > then we should do so not at the time of recording the conflict but at > the time of resolving it, i.e. at the time when the "working" version of > the file is deleted and replaced with the incoming dir. That will avoid > losing the changelist association if the user chooses to keep "mine", > which is good behaviour.
I agree with all of the above. -- C. Michael Pilato <cmpil...@collab.net> CollabNet <> www.collab.net <> Distributed Development On Demand
signature.asc
Description: OpenPGP digital signature
