On 7/3/2010 6:24 AM, Adrian Buehlmann wrote: > > Hello Tk, it's been a while since you posted here :-) > > That's an effect of the shell extension's design, which is a trade-off > between speed, intruding windows processes with python.dll/mercurial or > not and overlay icon state accuracy. > > A trade-off that has been discussed quite a number of times on the > TortoiseHg mailing lists already (IMHO, ad nauseum). > > In the use case you cite, the file's timestamp is newer than the file's > timestamp in .hg/dirstate, but the file size hasn't changed (because of > you undoing the file edit). > > This state needs a file compare to resolve correctly, which the shell > extension won't do by design (because of the design trade-off choosen). >
I haven't looked in detail how TortoiseHg handles this, but... Anything useful (and applicable) in how git handles these? http://www.kernel.org/pub/software/scm/git/docs/technical/racy-git.txt ------------------------------------------------------------------------------ Oracle to DB2 Conversion Guide: Learn learn about native support for PL/SQL, new data types, scalar functions, improved concurrency, built-in packages, OCI, SQL*Plus, data movement tools, best practices and more. http://p.sf.net/sfu/oracle-sfdev2dev _______________________________________________ Tortoisehg-discuss mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss
