[PATCH] Fix walking over non-existant and unhandled files

Bryan O'Sullivan bos at serpentine.com
Sat Aug 13 18:29:41 CDT 2005


On Sat, 2005-08-13 at 08:55 -0700, Bryan O'Sullivan wrote:
> On Sat, 2005-08-13 at 01:09 -0700, Matt Mackall wrote:
> 
> > A bunch of tests are failing on your tip, can you take a look?
> 
> Yep.

I've fixed those tests, merged with TAH's changes, and the results are
pullable from http://www.serpentine.com/hg

Incidentally, kdiff3 was a lifesaver for doing the merge.

The current version of tkdiff doesn't work with the hgmerge script any
more (it throws up an error dialog).  I also tried meld, but it has that
incomprehensible UI coupled with no useful documentation thing
happening.

	<b



More information about the Mercurial mailing list