Sat, 12 Apr 2008 20:03:54 +0200 remove trailing whitespace introduced in cfeeac24fc1e
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 12 Apr 2008 20:03:54 +0200] rev 6528
remove trailing whitespace introduced in cfeeac24fc1e
Sat, 12 Apr 2008 06:37:38 +0300 templates/coal: spell class correctly in {fileentry}
Giorgos Keramidas <keramida@ceid.upatras.gr> [Sat, 12 Apr 2008 06:37:38 +0300] rev 6527
templates/coal: spell class correctly in {fileentry}
Fri, 11 Apr 2008 22:19:52 -0700 repo: add rjoin method
Bryan O'Sullivan <bos@serpentine.com> [Fri, 11 Apr 2008 22:19:52 -0700] rev 6526
repo: add rjoin method
Fri, 11 Apr 2008 22:19:51 -0700 parseurl: make revs optional
Bryan O'Sullivan <bos@serpentine.com> [Fri, 11 Apr 2008 22:19:51 -0700] rev 6525
parseurl: make revs optional
Fri, 11 Apr 2008 22:18:38 -0700 Hoist localpath to the top level
Bryan O'Sullivan <bos@serpentine.com> [Fri, 11 Apr 2008 22:18:38 -0700] rev 6524
Hoist localpath to the top level
Fri, 11 Apr 2008 22:17:20 -0700 test-imerge: disable due to massive brokenness
Bryan O'Sullivan <bos@serpentine.com> [Fri, 11 Apr 2008 22:17:20 -0700] rev 6523
test-imerge: disable due to massive brokenness
Fri, 04 Apr 2008 02:21:53 +0300 use internal merge tool when specified for a merge-pattern in hgrc
Dov Feldstern <dfeldstern@fastimap.com> [Fri, 04 Apr 2008 02:21:53 +0300] rev 6522
use internal merge tool when specified for a merge-pattern in hgrc It is possible to specify in the hgrc file that one of the internal merge tools (internal:fail, internal:local or internal:other) be used for performing merges on files matching a given pattern. However, this setting is not being acted upon (the merge tool is not found). This patch fixes that.
Fri, 04 Apr 2008 02:20:58 +0300 test that internal merge tools are used when set for a merge-pattern in hgrc
Dov Feldstern <dfeldstern@fastimap.com> [Fri, 04 Apr 2008 02:20:58 +0300] rev 6521
test that internal merge tools are used when set for a merge-pattern in hgrc It is possible to specify that one of the internal merge tools (internal:fail, internal:local or internal:other) should be used for performing merges on files matching a given pattern. This test makes sure that such a setting actually works.
Sat, 12 Apr 2008 22:41:07 -0400 fix import with -p0
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 12 Apr 2008 22:41:07 -0400] rev 6520
fix import with -p0
Sat, 12 Apr 2008 21:08:03 +0200 context: handle untracked files in filectx.fileflags()
Patrick Mezard <pmezard@gmail.com> [Sat, 12 Apr 2008 21:08:03 +0200] rev 6519
context: handle untracked files in filectx.fileflags()
(0) -3000 -1000 -300 -100 -10 +10 +100 +300 +1000 +3000 +10000 +30000 tip