upstream/mercurial-mirror Files · tests/test-manifest-merging.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-manifest-merging.t
        
                    37 lines
            
             | 752 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-manifest-merging.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init base

        $ cd base

        $ echo 'alpha' > alpha

        $ hg ci -A -m 'add alpha'

        adding alpha

        $ cd ..

        $ hg clone base work

        updating to branch default

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

        $ cd work

        $ echo 'beta' > beta

        $ hg ci -A -m 'add beta'

        adding beta

        $ cd ..

        $ cd base

        $ echo 'gamma' > gamma

        $ hg ci -A -m 'add gamma'

        adding gamma

        $ cd ..

        $ cd work

        $ hg pull -q

        $ hg merge

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

        (branch merge, don't forget to commit)

      Update --clean to revision 1 to simulate a failed merge:

        $ rm alpha beta gamma

        $ hg update --clean 1

        2 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ 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 base

				$ cd base
				$ echo 'alpha' > alpha
				$ hg ci -A -m 'add alpha'
				adding alpha
				$ cd ..

				$ hg clone base work
				updating to branch default
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved

				$ cd work
				$ echo 'beta' > beta
				$ hg ci -A -m 'add beta'
				adding beta
				$ cd ..

				$ cd base
				$ echo 'gamma' > gamma
				$ hg ci -A -m 'add gamma'
				adding gamma
				$ cd ..

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

				Update --clean to revision 1 to simulate a failed merge:

				$ rm alpha beta gamma
				$ hg update --clean 1
				2 files updated, 0 files merged, 0 files removed, 0 files unresolved

				$ cd ..