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

Bryan O'Sullivan - - Load All Authors

File last commit:

r17132:b87acfda default


                r29480:1e4512ea

default

Download file

             test-extra-filelog-entry.t
        
                    21 lines
            
             | 448 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-extra-filelog-entry.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      Issue351: mq: qrefresh can create extra revlog entry

        $ echo "[extensions]" >> $HGRCPATH

        $ echo "mq=" >> $HGRCPATH

        $ hg init

        $ hg qinit

        $ echo b > b

        $ hg ci -A -m foo

        adding b

        $ echo cc > b

        $ hg qnew -f foo.diff

        $ echo b > b

        $ hg qrefresh

        $ hg debugindex b

           rev    offset  length  ..... linkrev nodeid       p1           p2 (re)

             0         0       3  .....       0 1e88685f5dde 000000000000 000000000000 (re)

	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

				Issue351: mq: qrefresh can create extra revlog entry

				$ echo "[extensions]" >> $HGRCPATH
				$ echo "mq=" >> $HGRCPATH

				$ hg init
				$ hg qinit

				$ echo b > b
				$ hg ci -A -m foo
				adding b

				$ echo cc > b
				$ hg qnew -f foo.diff
				$ echo b > b
				$ hg qrefresh

				$ hg debugindex b
				rev offset length ..... linkrev nodeid p1 p2 (re)
				0 0 3 ..... 0 1e88685f5dde 000000000000 000000000000 (re)