Aleix Conchillo Flaque <aleix@member.fsf.org> [Thu, 07 Feb 2008 12:31:29 +0100] rev 6044
convert: do not skip some lines in gnu arch summaries
Bryan O'Sullivan <bos@serpentine.com> [Wed, 06 Feb 2008 20:00:35 -0800] rev 6043
Merge with crew
Bryan O'Sullivan <bos@serpentine.com> [Wed, 06 Feb 2008 19:57:52 -0800] rev 6042
Merge with crew
jorendorff@mozilla.com [Thu, 26 Jul 2007 07:56:27 -0400] rev 6041
mq.py: add -U option to hg qdiff command
jorendorff@mozilla.com [Thu, 26 Jul 2007 07:56:04 -0400] rev 6040
commands.py, patch.py: add -U option to hg diff command
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 07 Feb 2008 00:41:30 +0100] rev 6039
Update help output of test-convert for GNU arch entry.
Patrick Mezard <pmezard@gmail.com> [Wed, 06 Feb 2008 23:24:15 +0100] rev 6038
Merge with crew-stable
Aleix Conchillo Flaque <aleix@member.fsf.org> [Wed, 06 Feb 2008 11:42:04 +0100] rev 6037
convert: add full description for gnu arch revisions
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 06 Feb 2008 09:11:36 +0100] rev 6036
merge with main
Aleix Conchillo Flaque <aleix@member.fsf.org> [Tue, 05 Feb 2008 09:30:08 +0100] rev 6035
convert: added GNU Arch source converter
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 08 Feb 2008 18:07:55 -0200] rev 6034
qinit -c: add ^\.hg and ^\.mq to .hgignore
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 08 Feb 2008 18:07:55 -0200] rev 6033
dirstate.status: avoid putting ignored files in the unknown list
If list_ignored was false, we would blindly add files not in the
dirstate to the unknown list.
This should finish fixing
issue886.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 08 Feb 2008 18:07:55 -0200] rev 6032
dirstate: don't walk ignored directories
With a pattern like '^directory$' in .hgignore, a "hg status directory"
would still walk "directory" and all its subdirs.
This is the first half of a fix for
issue886.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 08 Feb 2008 18:07:55 -0200] rev 6031
revert: don't assume ignored files will be returned in the unknown list
That's just an artifact of the current implementation, and I'll change
that soon.
Bonus points:
- we don't care about the unknown list at all
- we don't print an extra message if we try to revert a removed file
that is not present in the target revision
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 08 Feb 2008 18:07:55 -0200] rev 6030
revert: revert clean files when only a change of flags is needed
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 08 Feb 2008 18:07:55 -0200] rev 6029
Revert
e82dd2dd6276
Those files are supposed to be HTML 4.01, not XML.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 08 Feb 2008 11:50:37 +0100] rev 6028
make static-http work with empty repos (
issue965)
Patrick Mezard <pmezard@gmail.com> [Wed, 06 Feb 2008 23:09:13 +0100] rev 6027
mq: qimport must read patches in binary mode
Matt Mackall <mpm@selenic.com> [Tue, 05 Feb 2008 16:09:21 -0600] rev 6026
keyword: fix my string pasting thinko
Spotted by Maxim Dounin
Steve Borho <steve@borho.org> [Mon, 04 Feb 2008 19:38:34 -0600] rev 6025
filemerge: wrap quotes around tool path
Christian Ebert <blacktrash@gmx.net> [Mon, 04 Feb 2008 21:08:45 +0100] rev 6024
keyword: nokwcommands, restricted string variables at top level
- prettier syntax conforming eg. to commands.norepo
- possibly easier to hook from outside
Christian Ebert <blacktrash@gmx.net> [Mon, 04 Feb 2008 18:27:36 +0100] rev 6023
keyword: split line continuation in 2 steps (style)
Christian Ebert <blacktrash@gmx.net> [Mon, 04 Feb 2008 18:27:36 +0100] rev 6022
keyword: add empty_ok argument to kwrepo.commit
Christian Ebert <blacktrash@gmx.net> [Mon, 04 Feb 2008 18:27:36 +0100] rev 6021
keyword: allow keyword expansion on clone
If [keyword] filename patterns are specified in a global hgrc
keywords will be expanded in clone.
This behaviour is more consistent but also more dangerous.
Specifying global, and thus more complicted, [keyword] patterns
might slow things down as well.
Mention this in help?
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 05 Feb 2008 15:59:10 +0100] rev 6020
merge with crew-stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Tue, 05 Feb 2008 15:54:42 +0100] rev 6019
cleanly abort on unknown archive type (
issue966)
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 05 Feb 2008 14:34:46 +0100] rev 6018
merge with crew-stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Tue, 05 Feb 2008 14:02:03 +0100] rev 6017
hgweb: fix search skipping tip
dhruva <dhruvakm@gmail.com> [Mon, 04 Feb 2008 09:56:01 -0600] rev 6016
filemerge: fix pattern matching
Lee Cantey <lcantey@gmail.com> [Sun, 03 Feb 2008 23:58:02 -0800] rev 6015
filemerge: fix path to working file when fixeol is enabled