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
Matt Mackall <mpm@selenic.com> [Sun, 19 Aug 2007 14:04:26 -0500] rev 5207
Merge with -stable
Matt Mackall <mpm@selenic.com> [Sun, 19 Aug 2007 14:03:56 -0500] rev 5206
match: handle large regexes
Some Python versions don't handle large regexes, so when we hit an
overflow, split our regex in two.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 21 Aug 2007 02:13:32 +0200] rev 5205
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
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 21 Aug 2007 02:02:08 +0200] rev 5204
abort when adding a file in merged state
rupert.thurner@gmail.com [Mon, 20 Aug 2007 22:02:05 +0200] rev 5203
add import from url capability
Patrick Mezard <pmezard@gmail.com> [Sun, 19 Aug 2007 17:38:40 +0200] rev 5202
convert: load parent commits on-demand
Patrick Mezard <pmezard@gmail.com> [Sun, 19 Aug 2007 17:38:07 +0200] rev 5201
convert: wrap cached commits author remapping
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 18 Aug 2007 21:36:10 -0300] rev 5200
path_auditor: cache names of audited directories
We use a separate cache to avoid problems with
audit = path_auditor(repo.root)
audit("subrepo")
audit("subrepo/file")
whitelisting "subrepo" (which is fine) and then using the same whitelist
with "subrepo/file" (which is not fine).
Since we create a separate path_auditor for every path on the command line,
a "hg add dir/a dir/b dir/c" will still lstat dir 3 times just to audit
the paths.
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 18 Aug 2007 20:21:14 +0200] rev 5199
Quote ^ and ~ chars in test-parentrevspec.
At least ^ causes problems on some sh implementations.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 18 Aug 2007 14:25:55 -0300] rev 5198
Remove demandimport.enable from dispatch.py