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.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 27 Aug 2007 01:44:35 -0300] rev 5224
pull -u: if "url#rev" was given, update to rev
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 27 Aug 2007 01:44:35 -0300] rev 5223
clone: if "url#rev" was given, update to rev
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 27 Aug 2007 01:44:35 -0300] rev 5222
parseurl: also return the revision after the "#"; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 27 Aug 2007 01:44:35 -0300] rev 5221
pull -r: pass the revisions as the heads argument of findincoming
This can make a hg pull -r faster if the remote repo has many heads,
and fixes an "abort: received changelog group is empty".
Patrick Mezard <pmezard@gmail.com> [Sun, 26 Aug 2007 19:05:19 +0200] rev 5220
convert: fix /dev/null redirections under Windows
Patrick Mezard <pmezard@gmail.com> [Sun, 26 Aug 2007 15:07:13 +0200] rev 5219
Test git repository conversion
Patrick Mezard <pmezard@gmail.com> [Sun, 26 Aug 2007 15:35:57 +0200] rev 5218
hghave: detect git availability
Patrick Mezard <pmezard@gmail.com> [Sun, 26 Aug 2007 14:51:27 +0200] rev 5217
convert: fix issue702 about GIT_DIR= construct unsupported under Windows.
Brendan Cully <brendan@kublai.com> [Sun, 01 Jul 2007 21:09:08 -0700] rev 5216
convert: gitcmd wrapper for os.popen
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 24 Aug 2007 00:56:08 +0200] rev 5215
fix test-permissions output
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 24 Aug 2007 00:52:28 +0200] rev 5214
testcase for issue705 (fixed by 316ce5e85b3e)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 24 Aug 2007 00:39:16 +0200] rev 5213
merge with -stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 24 Aug 2007 00:38:08 +0200] rev 5212
check exec: return fallback in case of error during the check
If there is any error while checking if exec is supported,
we can return fallback.
fix issue705
Brendan Cully <brendan@kublai.com> [Thu, 23 Aug 2007 12:23:07 -0700] rev 5211
Do not lose previous tags when adding a tag in raw mode
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Thu, 23 Aug 2007 01:48:29 -0300] rev 5210
merge: forcefully mark files that we get from the second parent as dirty
After a hg merge, we want to include in the commit all the files that we
got from the second parent, so that we have the correct file-level
history. To make them visible to hg commit, we try to mark them as dirty.
Unfortunately, right now we can't really mark them as dirty[1] - the
best we can do is to mark them as needing a full comparison of their
contents, but they will still be considered clean if they happen to be
identical to the version in the first parent.
This changeset extends the dirstate format in a compatible way, so that
we can mark a file as dirty:
Right now we use a negative file size to indicate we don't have valid
stat data for this entry. In practice, this size is always -1.
This patch uses -2 to indicate that the entry is dirty. Older versions
of hg won't choke on this dirstate, but they may happily mark the file
as clean after a full comparison, destroying all of our hard work.
The patch adds a dirstate.normallookup method with the semantics of the
current normaldirty, and changes normaldirty to forcefully mark the
entry as dirty.
This should fix issue522.
[1] - well, we could put them in state 'm', but that state has a
different meaning.
Matt Mackall <mpm@selenic.com> [Mon, 20 Aug 2007 21:10:45 -0500] rev 5209
gendoc: use demandimport
Matt Mackall <mpm@selenic.com> [Mon, 20 Aug 2007 21:14:53 -0500] rev 5208
Merge with -crew
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 21 Aug 2007 02:13:32 +0200] rev 5207
make hg add of a removed file unremove the file
if a file was removed, hg add shouldn't mark the file
as added, but as normal
see issue683