upstream/mercurial-mirror Files · README.rst

tests: update annotate tests to work around simplemerge bug...

tests: update annotate tests to work around simplemerge bug test-annotate.t and test-fastannotate.hg were failing with --pure since (copies: calculate mergecopies() based on pathcopies(), 2019-04-11). It turned out to be because the pure file merge code behaved differently. I'm guessing it's the mdiff.get_matching_blocks() that behaves differently, but I haven't confirmed that. With this content in the base: a a a And this on the local side: a z a And this on the other side: a a a b4 c b6 It produced this conflict: a z a <<<<<<< working copy: - test: c ||||||| base a ======= a b4 c b5 >>>>>>> merge rev: - test: mergeb I don't care enough about the pure Python code to fix it, so this patch just updates the tests to manually resolve the conflict. Differential Revision: https://phab.mercurial-scm.org/D6351

David Demelier - - Load All Authors

File last commit:

r34580:1b59287a default


                r42446:d5b35d69

default

Download file

             README.rst
        
                    20 lines
            
             | 546 B
            
                | text/x-rst
            
             |
                RstLexer
            
             / README.rst
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        David Demelier
    
doc: rename README to README.rst...

              r34580
            
      Mercurial

      =========

      Mercurial is a fast, easy to use, distributed revision control tool

      for software developers.

      Basic install::

       $ make            # see install targets

       $ make install    # do a system-wide install

       $ hg debuginstall # sanity-check setup

       $ hg              # see help

      Running without installing::

       $ make local      # build for inplace usage

       $ ./hg --version  # should show the latest version

      See https://mercurial-scm.org/ for detailed installation

      instructions, platform-specific notes, and Mercurial user information.

	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

David Demelier doc: rename README to README.rst...	r34580	Mercurial
		=========

		Mercurial is a fast, easy to use, distributed revision control tool
		for software developers.

		Basic install::

		$ make # see install targets
		$ make install # do a system-wide install
		$ hg debuginstall # sanity-check setup
		$ hg # see help

		Running without installing::

		$ make local # build for inplace usage
		$ ./hg --version # should show the latest version

		See https://mercurial-scm.org/ for detailed installation
		instructions, platform-specific notes, and Mercurial user information.