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

timeless - - Load All Authors

File last commit:

r28251:4591cd6b default


                r29480:1e4512ea

default

Download file

             test-issue1102.t
        
                    17 lines
            
             | 354 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-issue1102.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ rm -rf a

        $ hg init a

        $ cd a

        $ echo a > a

        $ hg ci -Am0

        adding a

        $ hg tag t1 # 1

        $ hg tag --remove t1 # 2

        $ hg co 1

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

        $ hg tag -f -r0 t1

        $ hg tags

        tip                                3:a49829c4fc11

        t1                                 0:f7b1eb17ad24

        $ 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

				$ rm -rf a
				$ hg init a
				$ cd a
				$ echo a > a
				$ hg ci -Am0
				adding a
				$ hg tag t1 # 1
				$ hg tag --remove t1 # 2

				$ hg co 1
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ hg tag -f -r0 t1
				$ hg tags
				tip 3:a49829c4fc11
				t1 0:f7b1eb17ad24

				$ cd ..