changeset | 0c43f87baba3 |
---|---|
branch | default |
bookmark | |
tag | tip |
user | Maxim Dounin <mdounin@mdounin.ru> |
description | Fix file-changed-to-dir and dir-to-file commits (issue660). Allow adding to dirstate files that clash with previously existing but marked for removal. Protect from reintroducing clashes by revert. This change doesn't address related issues with update. Current workaround is to do "clean" update by manually removing conflicting files/dirs from working directory. |
files | mercurial/cmdutil.py mercurial/dirstate.py mercurial/util.py tests/test-issue660 tests/test-issue660.out |
changeset | 7ceb740f2fef |
---|---|
branch | |
bookmark | |
tag | |
user | Bryan O'Sullivan <bos@serpentine.com> |
description | See if execute bit is honoured when we go back in time |
files | tests/test-execute-bit tests/test-execute-bit.out |
changeset | 04f033a03b1d |
---|---|
branch | |
bookmark | |
tag | |
user | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
description | merge with -stable |
files |
changeset | 5223c360503e |
---|---|
branch | |
bookmark | |
tag | |
user | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
description | patchbomb: fix traceback when diffstat isn't available |
files | hgext/patchbomb.py |
changeset | dd5ca84ed868 |
---|---|
branch | |
bookmark | |
tag | |
user | Thomas Arendsen Hein <thomas@intevation.de> |
description | merge with crew-stable |
files |
changeset | bff41174563f |
---|---|
branch | |
bookmark | |
tag | |
user | Thomas Arendsen Hein <thomas@intevation.de> |
description | Only set mode of new patch if the target file was removed before. If the file is writable by the user, but owned by a different user, the chmod will otherwise fail with "Operation not permitted". Additionally make very sure that the file is only written if either the number of links is <= 1 or the file was successfully removed. Maybe this minimal COW code should be replaced by something from util. |
files | mercurial/patch.py |
changeset | f00ed7c5877b |
---|---|
branch | |
bookmark | |
tag | |
user | Patrick Mezard <pmezard@gmail.com> |
description | Merge with crew-stable |
files |
changeset | b3afa6725082 |
---|---|
branch | |
bookmark | |
tag | |
user | Sebastian Hauer <sebastian.hauer@gmail.com> |
description | httprepo: ignore environment proxies when proxies are disabled |
files | mercurial/httprepo.py |
changeset | 3aa5c45874c6 |
---|---|
branch | |
bookmark | |
tag | |
user | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
description | gpg: use the same log message format as hg tag |
files | hgext/gpg.py |
changeset | 5d8f5ad45c12 |
---|---|
branch | |
bookmark | |
tag | |
user | Matt Mackall <mpm@selenic.com> |
description | Added signature for changeset 23889160905a1b09fffe1c07378e9fc1827606eb |
files | .hgsigs |