Tue, 17 Jul 2007 09:39:30 -0700 Update test output to reflect small changes in patch chattiness.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 17 Jul 2007 09:39:30 -0700] rev 4901
Update test output to reflect small changes in patch chattiness.
Tue, 17 Jul 2007 09:39:30 -0700 patch.py: re-add the ability to use an external patch program
Bryan O'Sullivan <bos@serpentine.com> [Tue, 17 Jul 2007 09:39:30 -0700] rev 4900
patch.py: re-add the ability to use an external patch program This is now invoked by default only if ui.patch is set. Otherwise, we use our built-in patch. If that fails because it can't find any valid hunks, we'll fall back to trying the external patch command.
Tue, 17 Jul 2007 09:39:30 -0700 patch.py: don't mark files as changed unless they have actually been changed
Bryan O'Sullivan <bos@serpentine.com> [Tue, 17 Jul 2007 09:39:30 -0700] rev 4899
patch.py: don't mark files as changed unless they have actually been changed
Tue, 17 Jul 2007 09:39:30 -0700 patch.py: fix some incorrect uses of _() for i18n
Bryan O'Sullivan <bos@serpentine.com> [Tue, 17 Jul 2007 09:39:30 -0700] rev 4898
patch.py: fix some incorrect uses of _() for i18n
Tue, 17 Jul 2007 09:39:30 -0700 Add Chris Mason's mpatch library.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 17 Jul 2007 09:39:30 -0700] rev 4897
Add Chris Mason's mpatch library. The original repo is http://oss.oracle.com/mercurial/mason/mpatch
Tue, 17 Jul 2007 09:28:01 -0300 merge with crew-stable
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 17 Jul 2007 09:28:01 -0300] rev 4896
merge with crew-stable
Tue, 17 Jul 2007 09:08:29 -0300 convert: manually set encoding to UTF-8
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 17 Jul 2007 09:08:29 -0300] rev 4895
convert: manually set encoding to UTF-8 Right now the backends assume we're working in UTF-8 and there's no good way to ignore the encoding when adding revisions.
Tue, 17 Jul 2007 09:08:29 -0300 hg parents: don't pass an OS-specific path to repo.filectx
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 17 Jul 2007 09:08:29 -0300] rev 4894
hg parents: don't pass an OS-specific path to repo.filectx The only reason to use the matcher code instead of calling util.canonpath directly is to be able to use "path:canonical/path/to/file" patterns.
Tue, 17 Jul 2007 08:22:43 +0200 merge with main
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 17 Jul 2007 08:22:43 +0200] rev 4893
merge with main
Mon, 16 Jul 2007 20:15:03 -0700 tag: handle .hgtags and .hg/localtags with missing final newline (issue 601)
Bryan O'Sullivan <bos@serpentine.com> [Mon, 16 Jul 2007 20:15:03 -0700] rev 4892
tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) This also fixes an asymmetry bug in which we called the pretag hook if we were going to create a local tag, but didn't call the tag hook afterwards.
Mon, 16 Jul 2007 18:01:20 -0700 issue 622: pull/unbundle -u updates to default branch if repo was empty
Bryan O'Sullivan <bos@serpentine.com> [Mon, 16 Jul 2007 18:01:20 -0700] rev 4891
issue 622: pull/unbundle -u updates to default branch if repo was empty
Mon, 16 Jul 2007 16:50:47 -0700 mq: autodetect an existing git patch during qrefresh (issue 491)
Bryan O'Sullivan <bos@serpentine.com> [Mon, 16 Jul 2007 16:50:47 -0700] rev 4890
mq: autodetect an existing git patch during qrefresh (issue 491)
(0) -3000 -1000 -300 -100 -12 +12 +100 +300 +1000 +3000 +10000 +30000 tip