##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

copies: fix the changeset based algorithm regarding merge...
copies: fix the changeset based algorithm regarding merge In 99ebde4fec99, we changed the list of files stored into the `files` field. This lead to the changeset centric copy algorithm to break in various merge situation involving merge. Older information could reach the merge through `p1`, and while information from `p2` was strictly fresher, it would get overwritten anyway. We update the situation with more details about which revision introduces rename information. This help use making the right decision in case of merge. We are now running a more comprehensive suite of test with include this kind of situation. The behavior differ slightly from the filelog based in a couple of instance. There is mostly two distinct cases: 1) there are conflicting rename information in a merge (different rename history on each side). In this case the filelog based implementation arbitrarily pick a side based on the file-revision-number. So it depends on a local factor. The changeset centric algorithm will use a deterministic approach, by picking the information coming from the first parent of the merge. This is stable across different clone. 2) rename information related to file that exist in both source and destination. The filelog based implementation do not even try to detect these, however the changeset centric one get them for "free" (it is simpler to detect them than not). The new implementation focus on correctness. Performance improvement will come later. Differential Revision: https://phab.mercurial-scm.org/D8244
Denis Laxalde - - Load All Authors

File last commit:

r43640:8fda98a6 stable
r45252:45f3f35c default
Show More
control
41 lines | 1.1 KiB | text/plain | DebianControlLexer
/ contrib / packaging / debian / control
History | Source | Raw |Copy content |Copy permalink
Gregory Szorc
packaging: move contrib/debian to contrib/packaging/...
 r38029 Source: mercurial
Section: vcs
Priority: optional
Maintainer: Mercurial Developers <mercurial-devel@mercurial-scm.org>
Build-Depends:
debhelper (>= 9),
dh-python,
less,
netbase,
Denis Laxalde
packaging: upgrade Debian packaging to build with Python 3...
 r43615 python3-all,
python3-all-dev,
python3-docutils,
Gregory Szorc
packaging: move contrib/debian to contrib/packaging/...
 r38029 unzip,
zip
Standards-Version: 3.9.4
Denis Laxalde
packaging: upgrade Debian packaging to build with Python 3...
 r43615 X-Python3-Version: >= 3.5
Gregory Szorc
packaging: move contrib/debian to contrib/packaging/...
 r38029
Package: mercurial
Depends:
Denis Laxalde
packaging: ship only a single binary Debian package...
 r43627 sensible-utils,
Gregory Szorc
packaging: move contrib/debian to contrib/packaging/...
 r38029 ${shlibs:Depends},
${misc:Depends},
Denis Laxalde
packaging: upgrade Debian packaging to build with Python 3...
 r43615 ${python3:Depends},
Denis Laxalde
packaging: ship only a single binary Debian package...
 r43627 Recommends: ca-certificates
Suggests: wish
Denis Laxalde
packaging: remove version info from Breaks+Replaces in Debian package...
 r43640 Replaces: mercurial-common
Breaks: mercurial-common
Gregory Szorc
packaging: move contrib/debian to contrib/packaging/...
 r38029 Architecture: any
Description: fast, easy to use, distributed revision control tool.
Mercurial is a fast, lightweight Source Control Management system designed
for efficient handling of very large distributed projects.
.
Its features include:
* O(1) delta-compressed file storage and retrieval scheme
* Complete cross-indexing of files and changesets for efficient exploration
of project history
* Robust SHA1-based integrity checking and append-only storage model
* Decentralized development model with arbitrary merging between trees
* Easy-to-use command-line interface
* Integrated stand-alone web interface
* Small Python codebase