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

Mads Kiilerich - - Load All Authors

File last commit:

r16913:f2719b38 default


                r29480:1e4512ea

default

Download file

             test-empty-file.t
        
                    47 lines
            
             | 1.1 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-empty-file.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init a

        $ cd a

        $ touch empty1

        $ hg add empty1

        $ hg commit -m 'add empty1'

        $ touch empty2

        $ hg add empty2

        $ hg commit -m 'add empty2'

        $ hg up -C 0

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

        $ touch empty3

        $ hg add empty3

        $ hg commit -m 'add empty3'

        created new head

        $ hg heads

        changeset:   2:a1cb177e0d44

        tag:         tip

        parent:      0:1e1d9c4e5b64

        user:        test

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     add empty3

        changeset:   1:097d2b0e17f6

        user:        test

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     add empty2

        $ hg merge 1

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

        (branch merge, don't forget to commit)

      Before changeset 05257fd28591, we didn't notice the

      empty file that came from rev 1:

        $ hg status

        M empty2

        $ hg commit -m merge

        $ hg manifest --debug tip

        b80de5d138758541c5f05265ad144ab9fa86d1db 644   empty1

        b80de5d138758541c5f05265ad144ab9fa86d1db 644   empty2

        b80de5d138758541c5f05265ad144ab9fa86d1db 644   empty3

        $ 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

				$ hg init a
				$ cd a
				$ touch empty1
				$ hg add empty1
				$ hg commit -m 'add empty1'

				$ touch empty2
				$ hg add empty2
				$ hg commit -m 'add empty2'

				$ hg up -C 0
				0 files updated, 0 files merged, 1 files removed, 0 files unresolved
				$ touch empty3
				$ hg add empty3
				$ hg commit -m 'add empty3'
				created new head

				$ hg heads
				changeset: 2:a1cb177e0d44
				tag: tip
				parent: 0:1e1d9c4e5b64
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: add empty3

				changeset: 1:097d2b0e17f6
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: add empty2


				$ hg merge 1
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)

				Before changeset 05257fd28591, we didn't notice the
				empty file that came from rev 1:

				$ hg status
				M empty2
				$ hg commit -m merge
				$ hg manifest --debug tip
				b80de5d138758541c5f05265ad144ab9fa86d1db 644 empty1
				b80de5d138758541c5f05265ad144ab9fa86d1db 644 empty2
				b80de5d138758541c5f05265ad144ab9fa86d1db 644 empty3

				$ cd ..