Patrick Mezard <pmezard@gmail.com> [Mon, 27 Aug 2007 22:17:51 +0200] rev 5254
hghave: detect subversion bindings availability
Patrick Mezard <pmezard@gmail.com> [Mon, 27 Aug 2007 22:17:51 +0200] rev 5253
hghave: detect subversion client and admin tools availability
Patrick Mezard <pmezard@gmail.com> [Mon, 27 Aug 2007 22:17:51 +0200] rev 5252
hghave: wrap command output matching
Patrick Mezard <pmezard@gmail.com> [Mon, 27 Aug 2007 22:17:51 +0200] rev 5251
run-tests: append PYTHONPATH instead of overwriting it
Optional dependencies like svn bindings not necessarily live in site-packages.
Brendan Cully <brendan@kublai.com> [Mon, 27 Aug 2007 11:56:53 -0700] rev 5250
convert: svn: check for branch movement in any log entry, not just the first.
This fixes, for example,
r4151
D /branches
A /project/branches (from /branches:4150)
A /project/tags (from /tags:4150)
A /project/trunk (from /trunk:4150)
D /tags
D /trunk
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 27 Aug 2007 14:55:33 -0300] rev 5249
Merge with crew-stable.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 27 Aug 2007 02:21:58 -0300] rev 5248
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Sun, 26 Aug 2007 19:13:24 +0200] rev 5247
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Sun, 26 Aug 2007 16:49:26 +0200] rev 5246
Merge with crew-stable
Brendan Cully <brendan@kublai.com> [Sat, 25 Aug 2007 12:25:53 -0700] rev 5245
Improve extdiff configuration.
In addition to the old cmd.foo, opts.foo hgrc entries, allow a more simple
alias = command [opts]... form. For example:
[extdiff]
cdiff = colordiff -uprN
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 25 Aug 2007 16:31:37 +0200] rev 5244
cgi: sys.path.insert should be before importing mercurial
thanks to R. Burke
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 25 Aug 2007 11:30:59 +0200] rev 5243
merge with crew
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 25 Aug 2007 11:30:11 +0200] rev 5242
improve error message for 'hg merge' when repo already at branchtip
Brendan Cully <brendan@kublai.com> [Thu, 23 Aug 2007 22:45:41 -0700] rev 5241
imerge: add automerge flag to attempt to batch merge all conflicts
Brendan Cully <brendan@kublai.com> [Thu, 23 Aug 2007 19:52:15 -0700] rev 5240
Merge with crew
Brendan Cully <brendan@kublai.com> [Thu, 23 Aug 2007 19:51:59 -0700] rev 5239
imerge: fix ancestor calculation
If wctx already has two parents, ancestor calculation is wrong.
Normally merge is called before wctx gets the second parent, so
we simulate this in imerge by temporarily popping the second parent
before calling filemerge. Highly dirty.
This patch also handles the ParseError move from cmdutil to dispatch.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 24 Aug 2007 00:56:56 +0200] rev 5238
merge with crew-stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 24 Aug 2007 00:53:16 +0200] rev 5237
merge with crew-stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 24 Aug 2007 00:39:59 +0200] rev 5236
merge with crew-stable
Brendan Cully <brendan@kublai.com> [Thu, 23 Aug 2007 13:59:52 -0700] rev 5235
mq: some improvements to header rewriting (closes #690)
Tested with qrefresh -m against the mm series.
Brendan Cully <brendan@kublai.com> [Thu, 23 Aug 2007 12:24:54 -0700] rev 5234
Merge with crew-stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 31 Aug 2007 22:31:43 +0200] rev 5233
merge with crew-stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 31 Aug 2007 22:31:03 +0200] rev 5232
fix the dummy 00changelog.i not being copied on clone
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 31 Aug 2007 12:32:18 +0200] rev 5231
Make test-convert-git compatible with other git versions (tested with 1.4.4.3)
Brendan Cully <brendan@kublai.com> [Wed, 29 Aug 2007 16:15:23 -0700] rev 5230
When reverting a file which was renamed, also revert the old name
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 27 Aug 2007 14:21:04 -0300] rev 5229
correctly record file-level history when the local side renames a directory
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 27 Aug 2007 14:21:04 -0300] rev 5228
Fix theoretical issue in filecommit.
If the file was copied, we don't want to reuse the original entry.
I think this is mostly a theoretical issue - when there are copies,
fp1 == nullid, so it's very unlikely that the fl.cmp(fp1, t) would
think the file was unmodified. In any case, if there was a copy,
we should forcefully create a new entry.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 27 Aug 2007 14:21:04 -0300] rev 5227
Avoid adding to the changelog executable files added by the second parent.
This was a regression introduced by b51a8138292a.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 27 Aug 2007 01:44:35 -0300] rev 5226
avoid double slash problem mentioned in issue695
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 27 Aug 2007 01:44:35 -0300] rev 5225
clone: remove "file://" before making the path absolute
This avoids writing bogus paths to .hgrc. Fixes issue695.