upstream/mercurial-mirror Files · tests/test-merge5.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

Pierre-Yves David - - Load All Authors

File last commit:

r28065:6b1fc09c default


                r31990:3e03a4b9

default

Download file

             test-merge5.t
        
                    36 lines
            
             | 837 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-merge5.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Pradeepkumar Gayam
    
tests: unify test-merge5

              r11978
            
        $ hg init

        $ echo This is file a1 > a

        $ echo This is file b1 > b

        $ hg add a b

        Martin Geisler
    
test-merge5: removed unnecessary parts of test...

              r12155
            
        $ hg commit -m "commit #0"

        Pradeepkumar Gayam
    
tests: unify test-merge5

              r11978
            
        $ echo This is file b22 > b

        Martin Geisler
    
test-merge5: removed unnecessary parts of test...

              r12155
            
        $ hg commit -m "comment #1"

        Pradeepkumar Gayam
    
tests: unify test-merge5

              r11978
            
        $ hg update 0

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

        $ rm b

        Martin Geisler
    
test-merge5: removed unnecessary parts of test...

              r12155
            
        $ hg commit -A -m "comment #2"

        Pradeepkumar Gayam
    
tests: unify test-merge5

              r11978
            
        removing b

        created new head

        Brodie Rao
    
test-merge5: ensure updating to tip across branches is tested...

              r12154
            
        $ hg update 1

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

        Matt Mackall
    
update: check for missing files with --check (issue3595)

              r17849
            
        $ rm b

        Pierre-Yves David
    
update: change default destination to tipmost descendant (issue4673) (BC)...

              r28065
            
        $ hg update -c 2

        Siddharth Agarwal
    
update: standardize error message for dirty update --check...

              r19801
            
        abort: uncommitted changes

        Matt Mackall
    
update: check for missing files with --check (issue3595)

              r17849
            
        [255]

        $ hg revert b

        Pierre-Yves David
    
update: change default destination to tipmost descendant (issue4673) (BC)...

              r28065
            
        $ hg update -c 2

        Brodie Rao
    
test-merge5: ensure updating to tip across branches is tested...

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

        Pradeepkumar Gayam
    
tests: unify test-merge5

              r11978
            
        $ mv a c

        Martin Geisler
    
test-merge5: removed unnecessary parts of test...

              r12155
            
      Should abort:

        Martin von Zweigbergk
    
test-merge5: remove obsolete '-y' and its motivating comment...

              r23026
            
        $ hg update 1

        Siddharth Agarwal
    
update: add error message for dirty non-linear update with no rev...

              r19799
            
        abort: uncommitted changes

        (commit or update --clean to discard changes)

        Matt Mackall
    
tests: add exit codes to unified tests

              r12316
            
        [255]

        Pradeepkumar Gayam
    
tests: unify test-merge5

              r11978
            
        $ mv c a

        Martin Geisler
    
test-merge5: removed unnecessary parts of test...

              r12155
            
      Should succeed:

        Martin von Zweigbergk
    
test-merge5: remove obsolete '-y' and its motivating comment...

              r23026
            
        $ hg update 1

        Pradeepkumar Gayam
    
tests: unify test-merge5

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

	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

Pradeepkumar Gayam tests: unify test-merge5	r11978	$ hg init
		$ echo This is file a1 > a
		$ echo This is file b1 > b
		$ hg add a b
Martin Geisler test-merge5: removed unnecessary parts of test...	r12155	$ hg commit -m "commit #0"
Pradeepkumar Gayam tests: unify test-merge5	r11978	$ echo This is file b22 > b
Martin Geisler test-merge5: removed unnecessary parts of test...	r12155	$ hg commit -m "comment #1"
Pradeepkumar Gayam tests: unify test-merge5	r11978	$ hg update 0
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ rm b
Martin Geisler test-merge5: removed unnecessary parts of test...	r12155	$ hg commit -A -m "comment #2"
Pradeepkumar Gayam tests: unify test-merge5	r11978	removing b
		created new head
Brodie Rao test-merge5: ensure updating to tip across branches is tested...	r12154	$ hg update 1
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Matt Mackall update: check for missing files with --check (issue3595)	r17849	$ rm b
Pierre-Yves David update: change default destination to tipmost descendant (issue4673) (BC)...	r28065	$ hg update -c 2
Siddharth Agarwal update: standardize error message for dirty update --check...	r19801	abort: uncommitted changes
Matt Mackall update: check for missing files with --check (issue3595)	r17849	[255]
		$ hg revert b
Pierre-Yves David update: change default destination to tipmost descendant (issue4673) (BC)...	r28065	$ hg update -c 2
Brodie Rao test-merge5: ensure updating to tip across branches is tested...	r12154	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
Pradeepkumar Gayam tests: unify test-merge5	r11978	$ mv a c

Martin Geisler test-merge5: removed unnecessary parts of test...	r12155	Should abort:

Martin von Zweigbergk test-merge5: remove obsolete '-y' and its motivating comment...	r23026	$ hg update 1
Siddharth Agarwal update: add error message for dirty non-linear update with no rev...	r19799	abort: uncommitted changes
		(commit or update --clean to discard changes)
Matt Mackall tests: add exit codes to unified tests	r12316	[255]
Pradeepkumar Gayam tests: unify test-merge5	r11978	$ mv c a
Martin Geisler test-merge5: removed unnecessary parts of test...	r12155
		Should succeed:

Martin von Zweigbergk test-merge5: remove obsolete '-y' and its motivating comment...	r23026	$ hg update 1
Pradeepkumar Gayam tests: unify test-merge5	r11978	1 files updated, 0 files merged, 0 files removed, 0 files unresolved