From: Jakub Narebski Date: Sat, 21 Oct 2006 17:51:43 GMT Subject: Re: [ANNOUNCE] Example Cogito Addon - cogito-bundle Message-ID: <200610211951.43495.jnareb@gmail.com> In-Reply-To: <20061021174056.GA29927@artax.karlin.mff.cuni.cz> Jan Hudec wrote: > Besides I start to think that it should be actually possible to solve > this case with the git-style approach. I have to state beforehand, that > I don't know how the most recent git algorithm works, but I imagine > there is some kind of 'brackets' saying the text is in a given file. Now > if those 'brackets' were not flat, but nested, ie. instead of saying > 'this is in foo/bar' it would say 'this is in bar is in foo', the > difference when renaming directory would only affect the 'outer bracket' > and therefore merge correctly with adding content inside it. You mean, to consider "contents" of a directory union of contents of files and directories it contains, and then use the same "rename detection" algorithm as for files? -- Jakub Narebski Poland