upstream/mercurial-mirror Files · contrib/vagrant/provision.sh

merge: add tests to show current behavior on failed filemerges...

merge: add tests to show current behavior on failed filemerges Currently, failed file merges will nevertheless force the user to continue attempting to merge all additional unresolved files. Future patches will allow the user to halt the merge process instead. This patch first introduces a test demonstrating the current bejhavior so the upcoming changes are more obvious. Differential Revision: https://phab.mercurial-scm.org/D930

anatoly techtonik - - Load All Authors

File last commit:

r21874:8da01b6e default


                r34680:143337bc

default

Download file

             provision.sh
        
                    10 lines
            
             | 292 B
            
                | application/x-sh
            
             |
                BashLexer
            
             / contrib / vagrant / provision.sh
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #!/bin/sh

      # This scripts is used to install dependencies for

      # testing Mercurial. Mainly used by Vagrant (see

      # Vagrantfile for details).

      export DEBIAN_FRONTEND=noninteractive

      apt-get update

      apt-get install -y -q python-dev unzip

      # run-tests.sh is added by Vagrantfile

      chmod +x run-tests.sh

	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

				#!/bin/sh
				# This scripts is used to install dependencies for
				# testing Mercurial. Mainly used by Vagrant (see
				# Vagrantfile for details).

				export DEBIAN_FRONTEND=noninteractive
				apt-get update
				apt-get install -y -q python-dev unzip
				# run-tests.sh is added by Vagrantfile
				chmod +x run-tests.sh