On 18 September 2013 06:11, Grant Edwards <[email protected]> wrote: > I think the problem is that Meld finds a CVS directory in the CWD, but > doesn't find a .svn directory in the CWD. CVS puts a "CVS" directory > in every directory in the working copy, but SVN only puts a ".svn" > directory in the top-level directory. IIRC, older versions of > subversion put a ".svn" directory everywhere (like CVS does with "CVS" > directories).
Yep, that's the problem. > If Meld finds a "CVS" directory in the CWD, but doesn't find a ".svn" > directory in the CWD does it stop there, or does it continue to search > upwards for the ".svn" directory like it does when there's no "CVS" > directory? It does keep searching, but after doing all of its searching, it chooses the deepest VC root it finds as the 'true root'. This is so that if you're in nested repositories, you get the deepest one, which I think was the right behaviour back when we didn't support switching between VCs. Whether it's still right now is a different question. However, that aside, the underlying problem is that for VCs where we *don't* walk the tree to find the root (i.e., CVS and SVN < 1.7), we just report CWD as the root, which is wrong when figuring out what to use. cheers, Kai _______________________________________________ meld-list mailing list [email protected] https://mail.gnome.org/mailman/listinfo/meld-list
