upstream/mercurial-mirror Files · tests/test-merge5.t

update: show the commit to which we updated in case of multiple heads (BC)...

update: show the commit to which we updated in case of multiple heads (BC) Currently when we have multiple heads on the same branch, update tells us that there some more heads for the current branch but does not tells us the head to which the repository has been updated to. It makes more sense showing the head we updated to and then telling there are some more heads.

Pierre-Yves David - - Load All Authors

File last commit:

r28065:6b1fc09c default


                r32698:1b5c61d3

default

Download file

             test-merge5.t
        
                    36 lines
            
             | 837 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-merge5.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init

        $ echo This is file a1 > a

        $ echo This is file b1 > b

        $ hg add a b

        $ hg commit -m "commit #0"

        $ echo This is file b22 > b

        $ hg commit -m "comment #1"

        $ hg update 0

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

        $ rm b

        $ hg commit -A -m "comment #2"

        removing b

        created new head

        $ hg update 1

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

        $ rm b

        $ hg update -c 2

        abort: uncommitted changes

        [255]

        $ hg revert b

        $ hg update -c 2

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

        $ mv a c

      Should abort:

        $ hg update 1

        abort: uncommitted changes

        (commit or update --clean to discard changes)

        [255]

        $ mv c a

      Should succeed:

        $ hg update 1

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

	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
				$ echo This is file a1 > a
				$ echo This is file b1 > b
				$ hg add a b
				$ hg commit -m "commit #0"
				$ echo This is file b22 > b
				$ hg commit -m "comment #1"
				$ hg update 0
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ rm b
				$ hg commit -A -m "comment #2"
				removing b
				created new head
				$ hg update 1
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ rm b
				$ hg update -c 2
				abort: uncommitted changes
				[255]
				$ hg revert b
				$ hg update -c 2
				0 files updated, 0 files merged, 1 files removed, 0 files unresolved
				$ mv a c

				Should abort:

				$ hg update 1
				abort: uncommitted changes
				(commit or update --clean to discard changes)
				[255]
				$ mv c a

				Should succeed:

				$ hg update 1
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved