Nicolas Dumazet <nicdumz.commits@gmail.com> [Sat, 22 Aug 2009 15:47:03 +0200] rev 9386
util: canonpath: simplify logic
if root == os.sep, then endswithsep(root) is True as well: one test is enough
Patrick Mezard <pmezard@gmail.com> [Sun, 23 Aug 2009 13:03:10 +0200] rev 9385
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Sun, 23 Aug 2009 11:32:44 +0200] rev 9384
test-parse-date: test 12-hours time formats (issue1804)
Carey Evans <carey@carey.geek.nz> [Fri, 21 Aug 2009 21:52:57 +1200] rev 9383
util: Fix date format for 12-hour time.
Mads Kiilerich <mads@kiilerich.com> [Sat, 22 Aug 2009 15:36:52 +0200] rev 9382
test-command-template: Don't diff files with same content
Solaris diff will report "No differences encountered" on stdout
Martin Geisler <mg@lazybytes.net> [Sat, 22 Aug 2009 10:52:53 +0200] rev 9381
Merge with crew-stable
Martin Geisler <mg@lazybytes.net> [Sat, 22 Aug 2009 10:50:29 +0200] rev 9380
hgrc.5: document %unset directive
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 22 Aug 2009 10:25:50 +0200] rev 9379
merge with crew-stable
Adrian Buehlmann <adrian@cadifra.com> [Fri, 21 Aug 2009 14:17:23 +0200] rev 9378
dirstate.write: don't ignore stat data if mtime is in the future (issue1790)
This change narrows the race guard that was introduced by af3f26b6bba4
("dirstate: ignore stat data for files that were updated too recently")
to not discard the _map entry's stat data if the mtime is in the future.
Without this change, status locks files having odd mtimes in the future
into the 'unset' state, causing needless file compares later (admittedly
harmless), but also inflicting highly irritating sticky effects on
tools/plugins that directly read .hg/dirstate (e.g. TortoiseHg).
Martin Geisler <mg@lazybytes.net> [Sat, 22 Aug 2009 01:37:28 +0200] rev 9377
Merge with crew-stable