Commits

Show all
Author Commit Message Labels Comments Date
Bryan O'Sullivan
Tests for issue 1049
Tags
1.0
Bryan O'Sullivan
commit: when committing the results of a merge, it's all or nothing 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
Skip older monotone versions for tests. 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
run-tests.py: Only one fail message when output changed and error code. 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
mq: use repo.changelog.tip() instead of the "tip" tag
Thomas Arendsen Hein
Fix missing space in one of the new update messages.
Alexis S. L. Carvalho
qclone: do not abort if remote hasn't enabled mq (issue1040)
Alexis S. L. Carvalho
hgweb: add compatibility code for old templates 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
Merge with crew
Matt Mackall
update: better logic and messages for updates - 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)
Patrick Mézard
test-convert-mtn: test directory move
Patrick Mézard
convert: record deleted files in monotone source
Dirkjan Ochtman
hgweb: fix breakage in python < 2.5 introduced in 2c370f08c486
Alexis S. L. Carvalho
setup.py: hide compiler error messages while searching for inotify
Patrick Mézard
Add a test for monotone conversion
Alexis S. L. Carvalho
don't use hasattr in repo.invalidate hasattr ends up calling __getattr__ which will instantiate the very attributes we want to remove.
Alexis S. L. Carvalho
localrepo.commit: grab locks before getting the list of files to commit 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 …
Alexis S. L. Carvalho
Avoid calling heads() twice on every hg commit. 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).
Dirkjan Ochtman
hgweb: better error messages
Patrick Mézard
Remove unexpected "Alternately" word from tip help.
Thomas Arendsen Hein
run-tests.py: Allow environment variables to set jobs/timeout/port.
Patrick Mézard
convertrepo: make it work with refactored convert extension
Patrick Mézard
Make tip help more helpful
Patrick Mézard
test-imerge: test resolve subcommand
Patrick Mézard
imerge: replace "merge" with "internal:merge" when non-interactive
Patrick Mézard
hgk: display orphan revisions content (issue 1041)
Patrick Mézard
test-mq-symlinks: skip if symlinks are not supported
Florent Guillaume
test-notify: make it pass on Mac OS X 10.5
Florent Guillaume
test-remove: make tests really pass Ah, the joys of cross-platform shell scripting...
Florent Guillaume
test-remove: fix for non-gnu find
  1. Prev
  2. Next