- Mar 24, 2008
-
-
Matt Mackall authored
-
Bryan O'Sullivan authored
Previously, it was possible to commit just one file from a merge, which is essentially always the wrong thing to do. This fixes issue 1049.
-
Thomas Arendsen Hein authored
test-convert-mtn is known to work with 0.37 and 0.38, but fails with 0.31 (Debian etch). hghave now skips all versions up to 0.31.
-
Thomas Arendsen Hein authored
This fixes passing back fail messages mistaken for skip messages when running with parallel jobs because run_children() only expects one message per fail.
-
Alexis S. L. Carvalho authored
-
Thomas Arendsen Hein authored
-
Alexis S. L. Carvalho authored
-
Alexis S. L. Carvalho authored
Up to changeset 3340aa5a64f7, HTTP headers were expected to be embedded in the "headers" template. Since that changeset, the content-type is supposed to be defined as the "mimetype" template in the map file. This changeset makes sure the old templates still work.
-
Matt Mackall authored
-
Patrick Mezard authored
-
Patrick Mezard authored
-
Matt Mackall authored
- complain about attempts to merge with ancestor - when updating, differentiate between - crossing named branches with no local changes (jump) - crossing named branches with local changes (complain) - nonlinear update on the same named branch, no changes (complain some more) - nonlinear update on the same named branch, changes (different complaining)
-
Dirkjan Ochtman authored
-
Alexis S. L. Carvalho authored
-
- Mar 23, 2008
-
-
Patrick Mezard authored
-
- Mar 24, 2008
-
-
Alexis S. L. Carvalho authored
hasattr ends up calling __getattr__ which will instantiate the very attributes we want to remove.
-
Alexis S. L. Carvalho authored
Somebody may change the dirstate after we've determined the parents of the working dir and run repo.status, but before we called wlock(). This should also fix issue997, where backout would change a file without changing its size and then call repo.commit without passing the list of files. If this happened in less than one second, we wouldn't detect any file changes - the in-memory dirstate still has the cached stat data for that file. Grabbing the wlock early causes the dirstate to be invalidated and we end up reading the dirstate file again, which has that file marked for lookup (size == -1). A better fix would be for backout to give repo.commit the exact list of files, but that'll require some changes to the revert operation. A significant user-visible change is that the precommit hook is always run with both locks grabbed - previously, hg commit would run it before grabbing any locks, but hg import would run it after grabbing locks.
-
Alexis S. L. Carvalho authored
In an extreme case (merging two revisions with very low revision numbers) this could be slower than the previous code, but it should be much faster in the usual cases (parents are near the tip). It also avoids some races in some uninteresting cases (e.g. two concurrent hg commits).
-
- Mar 23, 2008
-
-
Dirkjan Ochtman authored
-
Patrick Mezard authored
-
Thomas Arendsen Hein authored
-
Patrick Mezard authored
-
Patrick Mezard authored
-
Patrick Mezard authored
-
Patrick Mezard authored
-
Patrick Mezard authored
-
Patrick Mezard authored
-
Florent Guillaume authored
-
Florent Guillaume authored
Ah, the joys of cross-platform shell scripting...
-
Florent Guillaume authored
-
- Mar 22, 2008
-
-
Florent Guillaume authored
-
Dirkjan Ochtman authored
-
Dirkjan Ochtman authored
-
Dirkjan Ochtman authored
-
Thomas Arendsen Hein authored
-
Matt Mackall authored
-
Matt Mackall authored
-
Patrick Mezard authored
/tmp is symlinked in MacOSX therefore test scripts as well as python modules are installed in a symlinked location. coverage.py uses abspath() to normalize its inputs which fails if these are referencing real paths. Use realpath() instead.
-
Patrick Mezard authored
-