upstream/mercurial-mirror Files · contrib/packaging/debian/control

diff: add experimental support for "merge diffs"...

diff: add experimental support for "merge diffs" The way this works is it re-runs the merge and "stores" conflicts, and then diffs against the conflicted result. In a normal merge, you should only see diffs against conflicted regions or in cases where there was a semantic conflict but not a textual one. This makes it easier to detect "evil merges" that contain substantial new work embedded in the merge commit. Differential Revision: https://phab.mercurial-scm.org/D8504

Denis Laxalde - - Load All Authors

File last commit:

r43640:8fda98a6 stable


                r47177:1a7d12c8

default

Download file

             control
        
                    41 lines
            
             | 1.1 KiB
            
                | text/plain
            
             |
                DebianControlLexer
            
             / contrib / packaging / debian / control
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      Source: mercurial

      Section: vcs

      Priority: optional

      Maintainer: Mercurial Developers <mercurial-devel@mercurial-scm.org>

      Build-Depends:

       debhelper (>= 9),

       dh-python,

       less,

       netbase,

       python3-all,

       python3-all-dev,

       python3-docutils,

       unzip,

       zip

      Standards-Version: 3.9.4

      X-Python3-Version: >= 3.5

      Package: mercurial

      Depends:

       sensible-utils,

       ${shlibs:Depends},

       ${misc:Depends},

       ${python3:Depends},

      Recommends: ca-certificates

      Suggests: wish

      Replaces: mercurial-common

      Breaks: mercurial-common

      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

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				Source: mercurial
				Section: vcs
				Priority: optional
				Maintainer: Mercurial Developers <mercurial-devel@mercurial-scm.org>
				Build-Depends:
				debhelper (>= 9),
				dh-python,
				less,
				netbase,
				python3-all,
				python3-all-dev,
				python3-docutils,
				unzip,
				zip
				Standards-Version: 3.9.4
				X-Python3-Version: >= 3.5

				Package: mercurial
				Depends:
				sensible-utils,
				${shlibs:Depends},
				${misc:Depends},
				${python3:Depends},
				Recommends: ca-certificates
				Suggests: wish
				Replaces: mercurial-common
				Breaks: mercurial-common
				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