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

r22046:7a9cbb31 default


                r29480:1e4512ea

default

Download file

             test-revert-flags.t
        
                    23 lines
            
             | 312 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-revert-flags.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #require execbit

        $ hg init repo

        $ cd repo

        $ echo foo > foo

        $ chmod 644 foo

        $ hg ci -qAm '644'

        $ chmod 755 foo

        $ hg ci -qAm '755'

      reverting to rev 0

        $ hg revert -a -r 0

        reverting foo

        $ hg st

        M foo

        $ hg diff --git

        diff --git a/foo b/foo

        old mode 100755

        new mode 100644

        $ 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

				#require execbit

				$ hg init repo
				$ cd repo
				$ echo foo > foo
				$ chmod 644 foo
				$ hg ci -qAm '644'

				$ chmod 755 foo
				$ hg ci -qAm '755'

				reverting to rev 0

				$ hg revert -a -r 0
				reverting foo
				$ hg st
				M foo
				$ hg diff --git
				diff --git a/foo b/foo
				old mode 100755
				new mode 100644

				$ cd ..