upstream/mercurial-mirror Files · tests/test-issue842.t

update: teach hg to override untracked dir with a tracked file on update...

update: teach hg to override untracked dir with a tracked file on update This is a fix to an old problem when Mercurial got confused by an untracked folder with the same name as one of the files in a commit hg was trying to update to. It is pretty safe to remove this folder if it is empty. Backing up an empty folder seems to go against Mercurial's "don't track dirs" philosophy.

Matt Mackall - - Load All Authors

File last commit:

r26420:2fc86d92 default


                r29480:1e4512ea

default

Download file

             test-issue842.t
        
                    39 lines
            
             | 725 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-issue842.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Matt Mackall
    
urls: bulk-change BTS urls to new location

              r26420
            
      https://bz.mercurial-scm.org/842

        Adrian Buehlmann
    
tests: unify test-issue*

              r12195
            
        $ hg init

        $ echo foo > a

        $ hg ci -Ama

        adding a

        $ hg up -r0000

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

        $ echo bar > a

      Should issue new head warning:

        $ hg ci -Amb

        adding a

        created new head

        $ hg up -r0000

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

        $ echo stuffy > a

      Should not issue new head warning:

        $ hg ci -q -Amc

        $ hg up -r0000

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

        $ echo crap > a

        $ hg branch testing

        marked working directory as branch testing

        Matt Mackall
    
branch: warn on branching

              r15615
            
        (branches are permanent and global, did you want a bookmark?)

        Adrian Buehlmann
    
tests: unify test-issue*

              r12195
            
      Should not issue warning:

        $ hg ci -q -Amd

	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

Matt Mackall urls: bulk-change BTS urls to new location	r26420	https://bz.mercurial-scm.org/842
Adrian Buehlmann tests: unify test-issue*	r12195
		$ hg init
		$ echo foo > a
		$ hg ci -Ama
		adding a

		$ hg up -r0000
		0 files updated, 0 files merged, 1 files removed, 0 files unresolved

		$ echo bar > a

		Should issue new head warning:

		$ hg ci -Amb
		adding a
		created new head

		$ hg up -r0000
		0 files updated, 0 files merged, 1 files removed, 0 files unresolved

		$ echo stuffy > a

		Should not issue new head warning:

		$ hg ci -q -Amc

		$ hg up -r0000
		0 files updated, 0 files merged, 1 files removed, 0 files unresolved

		$ echo crap > a
		$ hg branch testing
		marked working directory as branch testing
Matt Mackall branch: warn on branching	r15615	(branches are permanent and global, did you want a bookmark?)
Adrian Buehlmann tests: unify test-issue*	r12195
		Should not issue warning:

		$ hg ci -q -Amd