upstream/mercurial-mirror Files · tests/test-manifest-merging.t

windows: add win32com.shell to demandimport ignore list...

windows: add win32com.shell to demandimport ignore list Module 'appdirs' tries to import win32com.shell (and catch ImportError as an indication of failure) to check whether some further functionality should be implemented one or another way [1]. Of course, demandimport lets it down, so if we want appdirs to work we have to add it to demandimport's ignore list. The reason we want appdirs to work is becuase it is used by setuptools [2] to determine egg cache location. Only fairly recent versions of setuptools depend on this so people don't see this often. [1] https://github.com/ActiveState/appdirs/blob/master/appdirs.py#L560 [2] https://github.com/pypa/setuptools/blob/aae0a928119d2a178882c32bded02270e30d0273/pkg_resources/__init__.py#L1369

Mads Kiilerich - - Load All Authors

File last commit:

r16913:f2719b38 default


                r31990:3e03a4b9

default

Download file

             test-manifest-merging.t
        
                    37 lines
            
             | 752 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-manifest-merging.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Adrian Buehlmann
    
tests: unify test-manifest*

              r12253
            
        $ hg init base

        $ cd base

        $ echo 'alpha' > alpha

        $ hg ci -A -m 'add alpha'

        adding alpha

        $ cd ..

        $ hg clone base work

        updating to branch default

        1 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ cd work

        $ echo 'beta' > beta

        $ hg ci -A -m 'add beta'

        adding beta

        $ cd ..

        $ cd base

        $ echo 'gamma' > gamma

        $ hg ci -A -m 'add gamma'

        adding gamma

        $ cd ..

        $ cd work

        $ hg pull -q

        $ hg merge

        1 files updated, 0 files merged, 0 files removed, 0 files unresolved

        (branch merge, don't forget to commit)

      Update --clean to revision 1 to simulate a failed merge:

        $ rm alpha beta gamma

        $ hg update --clean 1

        2 files updated, 0 files merged, 0 files removed, 0 files unresolved

        Mads Kiilerich
    
tests: add missing trailing 'cd ..'...

              r16913
            
        $ cd ..

	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

Adrian Buehlmann tests: unify test-manifest*	r12253	$ hg init base

		$ cd base
		$ echo 'alpha' > alpha
		$ hg ci -A -m 'add alpha'
		adding alpha
		$ cd ..

		$ hg clone base work
		updating to branch default
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved

		$ cd work
		$ echo 'beta' > beta
		$ hg ci -A -m 'add beta'
		adding beta
		$ cd ..

		$ cd base
		$ echo 'gamma' > gamma
		$ hg ci -A -m 'add gamma'
		adding gamma
		$ cd ..

		$ cd work
		$ hg pull -q
		$ hg merge
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)

		Update --clean to revision 1 to simulate a failed merge:

		$ rm alpha beta gamma
		$ hg update --clean 1
		2 files updated, 0 files merged, 0 files removed, 0 files unresolved

Mads Kiilerich tests: add missing trailing 'cd ..'...	r16913	$ cd ..