upstream/mercurial-mirror Files · contrib/vagrant/run-tests.sh

mergestate: don't pop stateextras when there are no conflicts on filemerge...

mergestate: don't pop stateextras when there are no conflicts on filemerge Even if `filemerge.filemerge()` didn't result in conflicts, we should not remove stateextras for a file since we now use that for more things than just merge time information. We use stateextras to store information which is required to be used by commit. I tracked this down while finding why a patch of mine which adds more commit related information does not work as expected and looses the extras in mergestate. Differential Revision: https://phab.mercurial-scm.org/D10148

anatoly techtonik - - Load All Authors

File last commit:

r21874:8da01b6e default


                r47539:1099ca17

default

Download file

             run-tests.sh
        
                    13 lines
            
             | 314 B
            
                | application/x-sh
            
             |
                BashLexer
            
             / contrib / vagrant / run-tests.sh
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #!/bin/sh

      # This scripts is used to setup temp directory in memory

      # for running Mercurial tests in vritual machine managed

      # by Vagrant (see Vagrantfile for details).

      cd /hgshared

      make local

      cd tests

      mkdir /tmp/ram

      sudo mount -t tmpfs -o size=100M tmpfs /tmp/ram

      export TMPDIR=/tmp/ram

      ./run-tests.py -l --time

	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 setup temp directory in memory
				# for running Mercurial tests in vritual machine managed
				# by Vagrant (see Vagrantfile for details).

				cd /hgshared
				make local
				cd tests
				mkdir /tmp/ram
				sudo mount -t tmpfs -o size=100M tmpfs /tmp/ram
				export TMPDIR=/tmp/ram
				./run-tests.py -l --time