util: copyfile: remove dest before copying
This prevents spurious problems writing to locked files on Windows.
merge: warn when internal:merge cannot merge symlinks
A follow-up to
d084df89d948.
internal:merge should never be picked for merging symlinks ... but in the test
suite we have HGMERGE="internal:merge" which bypasses all the usual merge-tool
cleverness. Without any output it can be hard to figure out what happened and
where the problem is.
histedit: correct the number of added revisions in online help
In the context of help document on which this patch focuses, the
example repository, which is source of cloning, should be already
histedit-ed, and contain only 3 revisions (rev # 0 to 2). So, not 3,
but 4 revisions should be added to the destination repository of
cloning, if it contains 7 revisions (rev # 0 to 6).
This patch also adds modifier "histedit-ed" to "example repository",
to make context clear.
histedit: correct changeset IDs in online help
There is no '
633536316234' revision in the example repository. It
should be '
c561b4e977df', according to the revisions in it and
explanation in help document.
convert: correct 'hooks' section name in online help
The section name for hooks is not 'hook', but 'hooks'.
hgweb: no do not use listinsert(0, ...)
This is not efficient. We now append element and either reverse the list or
iterate in reverse order.
localrepo: drop unnecessary check on wlock unlock
Calling out to dirstate one line before guarantees that it'll be in the filecache.