On Tue, 2007-12-18 at 17:11 -0800, J Decker wrote: > ---------- Forwarded message ---------- > From: J Decker <[EMAIL PROTECTED]> > Date: Dec 18, 2007 5:11 PM > Subject: Re: [Monotone-devel] Directory already exists? > To: Timothy Brownawell <[EMAIL PROTECTED]> > > > Having thought about this a bit more... if a directory is an object, > why can't it just be merged with other changes? If I make a > modification to a file, and create a line, when an update happens, > changes are merged even with the new lines... I mean lines are objects > at a certain point.
Adding lines to a file is roughly equivalent to adding files to a directory, it's seen as a modification to an existing object. Merging a (unversioned) directory that exists in the workspace with a directory being added in an update is seen as the same as merging a (unversioned) file that exists in the workspace with a file being added in an update, or two objects (directory or file) added with the same name in separate branches, ie 2-way merge where two distinct objects are made into one. This isn't permitted, because it would make it rather annoying to try to guarantee that the merge algorithm will behave sanely. -- Timothy Free (experimental) public monotone hosting: http://mtn-host.prjek.net _______________________________________________ Monotone-devel mailing list Monotone-devel@nongnu.org http://lists.nongnu.org/mailman/listinfo/monotone-devel
