upstream/mercurial-mirror Files · tests/test-subrepo-missing.t

rebase: use revset as soon as possible in internal logic...

rebase: use revset as soon as possible in internal logic The buildstate function now take a set of revs. Logic related to --source and --base option have been moved in the main rebase function. In the process this fixes a bug where the wrong source changeset might be pick. This explain the changes in hgext/rebase.py

Matt Mackall - - Load All Authors

File last commit:

r14870:f73c7b70 stable


                r15267:3bfdfefe

default

Download file

             test-subrepo-missing.t
        
                    55 lines
            
             | 1.3 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-subrepo-missing.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init repo

        $ cd repo

        $ hg init subrepo

        $ echo a > subrepo/a

        $ hg -R subrepo ci -Am adda

        adding a

        $ echo 'subrepo = subrepo' > .hgsub

        $ hg ci -Am addsubrepo

        adding .hgsub

        committing subrepository subrepo

        $ echo b > subrepo/b

        $ hg -R subrepo ci -Am addb

        adding b

        $ hg ci -m updatedsub

        committing subrepository subrepo

      delete .hgsub and revert it

        $ rm .hgsub

        $ hg revert .hgsub

        warning: subrepo spec file .hgsub not found

        warning: subrepo spec file .hgsub not found

      delete .hgsubstate and revert it

        $ rm .hgsubstate

        $ hg revert .hgsubstate

      delete .hgsub and update

        $ rm .hgsub

        $ hg up 0

        warning: subrepo spec file .hgsub not found

        warning: subrepo spec file .hgsub not found

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

        $ hg st

        warning: subrepo spec file .hgsub not found

        ! .hgsub

        $ ls subrepo

        a

      delete .hgsubstate and update

        $ hg up -C

        warning: subrepo spec file .hgsub not found

        warning: subrepo spec file .hgsub not found

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

        $ rm .hgsubstate

        $ hg up 0  

        remote changed .hgsubstate which local deleted

        use (c)hanged version or leave (d)eleted? c

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

        $ hg st

        $ ls subrepo

        a

	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

				$ hg init repo
				$ cd repo
				$ hg init subrepo
				$ echo a > subrepo/a
				$ hg -R subrepo ci -Am adda
				adding a
				$ echo 'subrepo = subrepo' > .hgsub
				$ hg ci -Am addsubrepo
				adding .hgsub
				committing subrepository subrepo
				$ echo b > subrepo/b
				$ hg -R subrepo ci -Am addb
				adding b
				$ hg ci -m updatedsub
				committing subrepository subrepo

				delete .hgsub and revert it

				$ rm .hgsub
				$ hg revert .hgsub
				warning: subrepo spec file .hgsub not found
				warning: subrepo spec file .hgsub not found

				delete .hgsubstate and revert it

				$ rm .hgsubstate
				$ hg revert .hgsubstate

				delete .hgsub and update

				$ rm .hgsub
				$ hg up 0
				warning: subrepo spec file .hgsub not found
				warning: subrepo spec file .hgsub not found
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ hg st
				warning: subrepo spec file .hgsub not found
				! .hgsub
				$ ls subrepo
				a

				delete .hgsubstate and update

				$ hg up -C
				warning: subrepo spec file .hgsub not found
				warning: subrepo spec file .hgsub not found
				2 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ rm .hgsubstate
				$ hg up 0
				remote changed .hgsubstate which local deleted
				use (c)hanged version or leave (d)eleted? c
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ hg st
				$ ls subrepo
				a