Wed, 15 Aug 2007 16:09:50 -0500 remove unneeded imports of mdiff
Matt Mackall <mpm@selenic.com> [Wed, 15 Aug 2007 16:09:50 -0500] rev 5175
remove unneeded imports of mdiff
Wed, 15 Aug 2007 15:56:39 -0500 Merge with stable
Matt Mackall <mpm@selenic.com> [Wed, 15 Aug 2007 15:56:39 -0500] rev 5174
Merge with stable
Wed, 15 Aug 2007 13:21:23 -0700 convert: hg: optionally create branches as clones
Brendan Cully <brendan@kublai.com> [Wed, 15 Aug 2007 13:21:23 -0700] rev 5173
convert: hg: optionally create branches as clones If convert.hg.clonebranches is set, branches will be created as clones of their parent revisions. All clones will be subdirectories of the destination path.
Wed, 15 Aug 2007 17:27:51 +0200 Use smerge minor mode in emacs to resolve conflicts.
Sascha Wilde <wilde@sha-bang.de> [Wed, 15 Aug 2007 17:27:51 +0200] rev 5172
Use smerge minor mode in emacs to resolve conflicts. The condition-case is used to suppress errors with emacs versions before 21.
Wed, 15 Aug 2007 16:43:40 +0200 Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Wed, 15 Aug 2007 16:43:40 +0200] rev 5171
Merge with crew-stable
Tue, 14 Aug 2007 21:36:08 +0200 merge with crew-stable
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 14 Aug 2007 21:36:08 +0200] rev 5170
merge with crew-stable
Tue, 14 Aug 2007 19:30:14 +0200 Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Tue, 14 Aug 2007 19:30:14 +0200] rev 5169
Merge with crew-stable
Tue, 14 Aug 2007 19:06:10 +0200 Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Tue, 14 Aug 2007 19:06:10 +0200] rev 5168
Merge with crew-stable
Tue, 14 Aug 2007 18:25:27 +0200 fix bundlerepo broken by 4205f626dc05
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 14 Aug 2007 18:25:27 +0200] rev 5167
fix bundlerepo broken by 4205f626dc05 since we now use struct in case of lazy parser, this have to be an integer instead of None see issue681
Tue, 14 Aug 2007 16:30:38 +0200 Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Tue, 14 Aug 2007 16:30:38 +0200] rev 5166
Merge with crew-stable
Mon, 13 Aug 2007 11:58:47 -0700 imerge: simplify 1d5ebb0d366f
Brendan Cully <brendan@kublai.com> [Mon, 13 Aug 2007 11:58:47 -0700] rev 5165
imerge: simplify 1d5ebb0d366f
Mon, 13 Aug 2007 19:42:52 +0200 imerge: fix status file lookups
Patrick Mezard <pmezard@gmail.com> [Mon, 13 Aug 2007 19:42:52 +0200] rev 5164
imerge: fix status file lookups
Mon, 13 Aug 2007 19:42:52 +0200 demandimport: ignore pwd and grp.
Patrick Mezard <pmezard@gmail.com> [Mon, 13 Aug 2007 19:42:52 +0200] rev 5163
demandimport: ignore pwd and grp. Both are unavailable under Windows and tarfile detects them via ImportError.
Mon, 13 Aug 2007 19:42:50 +0200 util: ignore invalid path errors in path_auditor.
Patrick Mezard <pmezard@gmail.com> [Mon, 13 Aug 2007 19:42:50 +0200] rev 5162
util: ignore invalid path errors in path_auditor.
Sun, 12 Aug 2007 12:43:52 -0300 merge with crew-stable
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 12 Aug 2007 12:43:52 -0300] rev 5161
merge with crew-stable
Sat, 11 Aug 2007 13:35:25 +0200 merge with crew-stable
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 11 Aug 2007 13:35:25 +0200] rev 5160
merge with crew-stable
Fri, 10 Aug 2007 10:51:47 -0700 Make a few portability improvements to path auditing code.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 10 Aug 2007 10:51:47 -0700] rev 5159
Make a few portability improvements to path auditing code.
Fri, 10 Aug 2007 10:46:03 -0700 Make audit_path more stringent.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 10 Aug 2007 10:46:03 -0700] rev 5158
Make audit_path more stringent. The following properties of a path are now checked for: - under top-level .hg - starts at the root of a windows drive - contains ".." - traverses a symlink (e.g. a/symlink_here/b) - inside a nested repository If any of these is true, the path is rejected. The check for traversing a symlink is arguably stricter than necessary; perhaps we should be checking for symlinks that point outside the repository.
Thu, 09 Aug 2007 20:16:00 -0700 mq: teach qpop about symlinks
Bryan O'Sullivan <bos@serpentine.com> [Thu, 09 Aug 2007 20:16:00 -0700] rev 5157
mq: teach qpop about symlinks
Thu, 09 Aug 2007 20:03:34 -0700 debugstate: print symlinks as 'lnk', not '777'
Bryan O'Sullivan <bos@serpentine.com> [Thu, 09 Aug 2007 20:03:34 -0700] rev 5156
debugstate: print symlinks as 'lnk', not '777'
Thu, 09 Aug 2007 19:42:33 -0700 manifest: accept -r for rev specification
Bryan O'Sullivan <bos@serpentine.com> [Thu, 09 Aug 2007 19:42:33 -0700] rev 5155
manifest: accept -r for rev specification
Thu, 09 Aug 2007 17:29:16 -0700 record: improve docs, improve prompts
Bryan O'Sullivan <bos@serpentine.com> [Thu, 09 Aug 2007 17:29:16 -0700] rev 5154
record: improve docs, improve prompts
Thu, 09 Aug 2007 23:29:29 +0200 Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Thu, 09 Aug 2007 23:29:29 +0200] rev 5153
Merge with crew-stable
Thu, 09 Aug 2007 12:35:10 -0700 Merge with crew-stable
Brendan Cully <brendan@kublai.com> [Thu, 09 Aug 2007 12:35:10 -0700] rev 5152
Merge with crew-stable
Thu, 09 Aug 2007 11:37:47 -0700 Merge with crew-stable
Brendan Cully <brendan@kublai.com> [Thu, 09 Aug 2007 11:37:47 -0700] rev 5151
Merge with crew-stable
Thu, 09 Aug 2007 01:07:11 +0200 merge with -stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 09 Aug 2007 01:07:11 +0200] rev 5150
merge with -stable
Wed, 08 Aug 2007 23:11:12 +0200 Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Wed, 08 Aug 2007 23:11:12 +0200] rev 5149
Merge with crew-stable
Wed, 08 Aug 2007 23:00:01 +0200 merge with -stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 08 Aug 2007 23:00:01 +0200] rev 5148
merge with -stable
Wed, 08 Aug 2007 12:27:20 +0200 refactor options from cmdtable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 08 Aug 2007 12:27:20 +0200] rev 5147
refactor options from cmdtable - add extracommitopts for user and date - factor stuff
Tue, 07 Aug 2007 15:57:23 +0200 merge with crew-stable
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 07 Aug 2007 15:57:23 +0200] rev 5146
merge with crew-stable
(0) -3000 -1000 -300 -100 -50 -30 +30 +50 +100 +300 +1000 +3000 +10000 +30000 tip