Matt Mackall <mpm@selenic.com> [Sun, 13 Apr 2008 11:31:45 -0500] rev 6533
Merge with -stable
Adrian Buehlmann <adrian@cadifra.com> [Fri, 11 Apr 2008 15:14:00 +0200] rev 6532
removing unused local ccache in patch.diff
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 12 Apr 2008 23:05:51 -0400] rev 6531
merge with -stable
Patrick Mezard <pmezard@gmail.com> [Sat, 12 Apr 2008 20:51:26 +0200] rev 6530
merge: replace readline() call, missing from posixfile_nt
Patrick Mezard <pmezard@gmail.com> [Sat, 12 Apr 2008 21:34:01 +0200] rev 6529
Merge with crew-stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 12 Apr 2008 20:03:54 +0200] rev 6528
remove trailing whitespace introduced in cfeeac24fc1e
Giorgos Keramidas <keramida@ceid.upatras.gr> [Sat, 12 Apr 2008 06:37:38 +0300] rev 6527
templates/coal: spell class correctly in {fileentry}
Bryan O'Sullivan <bos@serpentine.com> [Fri, 11 Apr 2008 22:19:52 -0700] rev 6526
repo: add rjoin method
Bryan O'Sullivan <bos@serpentine.com> [Fri, 11 Apr 2008 22:19:51 -0700] rev 6525
parseurl: make revs optional
Bryan O'Sullivan <bos@serpentine.com> [Fri, 11 Apr 2008 22:18:38 -0700] rev 6524
Hoist localpath to the top level
Bryan O'Sullivan <bos@serpentine.com> [Fri, 11 Apr 2008 22:17:20 -0700] rev 6523
test-imerge: disable due to massive brokenness
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.
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.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 12 Apr 2008 22:41:07 -0400] rev 6520
fix import with -p0
Patrick Mezard <pmezard@gmail.com> [Sat, 12 Apr 2008 21:08:03 +0200] rev 6519
context: handle untracked files in filectx.fileflags()
Matt Mackall <mpm@selenic.com> [Fri, 11 Apr 2008 12:52:56 -0500] rev 6518
resolve: new command
- add basic resolve command functionality
- point failed update and merge at resolve
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 11 Apr 2008 12:04:26 +0200] rev 6517
python-2.6: use sha wrapper from util for new merge code
Adrian Buehlmann <adrian@cadifra.com> [Fri, 11 Apr 2008 09:27:28 +0200] rev 6516
fixed missing sorting in test-dumprevlog
The test failed at random because the order of files was non-deterministic,
which produced diffs in test output.
Patrick Mezard <pmezard@gmail.com> [Fri, 11 Apr 2008 11:21:55 +0200] rev 6515
test-dumprevlog: fix extra path separator under MacOSX
The "find .hg/store/ -name '*.i'" command returned paths with extra separators
like '.hg/store//00changelog.i'.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 11 Apr 2008 08:35:37 +0200] rev 6514
Merge from main.
Paul Moore <p.f.moore@gmail.com> [Thu, 10 Apr 2008 23:07:54 +0200] rev 6513
Add a batch file driver for Windows
Matt Mackall <mpm@selenic.com> [Thu, 10 Apr 2008 15:02:24 -0500] rev 6512
merge: introduce mergestate
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 10 Apr 2008 14:25:50 +0200] rev 6511
Merge with crew-stable.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 10 Apr 2008 14:08:38 +0200] rev 6510
win32text: actually import util so util.binary() can be used
Bryan O'Sullivan <bos@serpentine.com> [Wed, 09 Apr 2008 16:02:37 -0700] rev 6509
issue 1053: heavily qualify the "cp -al" advice for cloning
Bryan O'Sullivan <bos@serpentine.com> [Wed, 09 Apr 2008 15:49:20 -0700] rev 6508
Get rid of reimplementations of util.binary
Christian Ebert <blacktrash@gmx.net> [Tue, 08 Apr 2008 13:19:36 +0200] rev 6507
Let util.binary check entire data for \0 (issue1066, issue1079)
Christian Ebert <blacktrash@gmx.net> [Wed, 09 Apr 2008 14:12:32 +0200] rev 6506
keyword: check for '\0' in entire data before acting
util.binary might not be safe enough, as it fails eg. on certain
pdf files (issue1066).
Christian Ebert <blacktrash@gmx.net> [Wed, 09 Apr 2008 14:05:57 +0200] rev 6505
keyword: make overwrite() arguments mandatory
Christian Ebert <blacktrash@gmx.net> [Wed, 09 Apr 2008 14:05:57 +0200] rev 6504
keyword: compact setting of optional arguments