upstream/mercurial-mirror Files · tests/test-update-dest.t

copies: filter out copies when target is not in destination manifest...

copies: filter out copies when target is not in destination manifest When chaining a series of commits that copied a file with a series that removed the destination file, we would still include the copy in the result. Similar to the previous patch, I have checked that `hg status --copies` is not affected by this bug, but I wouldn't be surprised if some commands are. Differential Revision: https://phab.mercurial-scm.org/D5989

Denis Laxalde - - Load All Authors

File last commit:

r34662:eb586ed5 default


                r41920:d5edb5d3

default

Download file

             test-update-dest.t
        
                    49 lines
            
             | 1.3 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-update-dest.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      Test update.requiredest

        $ cd $TESTTMP

        $ cat >> $HGRCPATH <<EOF

        > [commands]

        > update.requiredest = True

        > EOF

        $ hg init repo

        $ cd repo

        $ echo a >> a

        $ hg commit -qAm aa

        $ hg up

        abort: you must specify a destination

        (for example: hg update ".::")

        [255]

        $ hg up .

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

        $ HGPLAIN=1 hg up

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

        $ hg --config commands.update.requiredest=False up

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

        $ cd ..

      Check update.requiredest interaction with pull --update

        $ hg clone repo clone

        updating to branch default

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

        $ cd repo

        $ echo a >> a

        $ hg commit -qAm aa

        $ cd ../clone

        $ hg pull --update

        abort: update destination required by configuration

        (use hg pull followed by hg update DEST)

        [255]

        $ cd ..

      update.requiredest should silent the "hg update" text after pull

        $ hg init repo1

        $ cd repo1

        $ hg pull ../repo

        pulling from ../repo

        requesting all changes

        adding changesets

        adding manifests

        adding file changes

        added 2 changesets with 2 changes to 1 files

        new changesets 8f0162e483d0:048c2cb95949

	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

				Test update.requiredest
				$ cd $TESTTMP
				$ cat >> $HGRCPATH <<EOF
				> [commands]
				> update.requiredest = True
				> EOF
				$ hg init repo
				$ cd repo
				$ echo a >> a
				$ hg commit -qAm aa
				$ hg up
				abort: you must specify a destination
				(for example: hg update ".::")
				[255]
				$ hg up .
				0 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ HGPLAIN=1 hg up
				0 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ hg --config commands.update.requiredest=False up
				0 files updated, 0 files merged, 0 files removed, 0 files unresolved

				$ cd ..

				Check update.requiredest interaction with pull --update
				$ hg clone repo clone
				updating to branch default
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ cd repo
				$ echo a >> a
				$ hg commit -qAm aa
				$ cd ../clone
				$ hg pull --update
				abort: update destination required by configuration
				(use hg pull followed by hg update DEST)
				[255]

				$ cd ..

				update.requiredest should silent the "hg update" text after pull
				$ hg init repo1
				$ cd repo1
				$ hg pull ../repo
				pulling from ../repo
				requesting all changes
				adding changesets
				adding manifests
				adding file changes
				added 2 changesets with 2 changes to 1 files
				new changesets 8f0162e483d0:048c2cb95949