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

rebase: don't mark file as removed if missing in parent's manifest (issue2725)

Augie Fackler - - Load All Authors

File last commit:

r12726:61c0df2b default


                r13778:46c30432

default

Download file

             test-1993.t
        
                    46 lines
            
             | 1.2 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-1993.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Augie Fackler
    
update: use revsingle to enable use of revsets as update targets (issue1993)

              r12726
            
        $ hg init a

        $ cd a

        $ echo a > a

        $ hg ci -Am0

        adding a

        $ echo b > b

        $ hg ci -Am1

        adding b

        $ hg tag -r0 default

        warning: tag default conflicts with existing branch name

        $ hg log

        changeset:   2:30a83d1e4a1e

        tag:         tip

        user:        test

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

        summary:     Added tag default for changeset f7b1eb17ad24

        changeset:   1:925d80f479bb

        user:        test

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

        summary:     1

        changeset:   0:f7b1eb17ad24

        tag:         default

        user:        test

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

        summary:     0

        $ hg update 'tag(default)'

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

        $ hg parents

        changeset:   0:f7b1eb17ad24

        tag:         default

        user:        test

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

        summary:     0

        $ hg update 'branch(default)'

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

        $ hg parents

        changeset:   2:30a83d1e4a1e

        tag:         tip

        user:        test

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

        summary:     Added tag default for changeset f7b1eb17ad24

	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

Augie Fackler update: use revsingle to enable use of revsets as update targets (issue1993)	r12726	$ hg init a
		$ cd a
		$ echo a > a
		$ hg ci -Am0
		adding a
		$ echo b > b
		$ hg ci -Am1
		adding b
		$ hg tag -r0 default
		warning: tag default conflicts with existing branch name
		$ hg log
		changeset: 2:30a83d1e4a1e
		tag: tip
		user: test
		date: Thu Jan 01 00:00:00 1970 +0000
		summary: Added tag default for changeset f7b1eb17ad24

		changeset: 1:925d80f479bb
		user: test
		date: Thu Jan 01 00:00:00 1970 +0000
		summary: 1

		changeset: 0:f7b1eb17ad24
		tag: default
		user: test
		date: Thu Jan 01 00:00:00 1970 +0000
		summary: 0

		$ hg update 'tag(default)'
		0 files updated, 0 files merged, 2 files removed, 0 files unresolved
		$ hg parents
		changeset: 0:f7b1eb17ad24
		tag: default
		user: test
		date: Thu Jan 01 00:00:00 1970 +0000
		summary: 0

		$ hg update 'branch(default)'
		2 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ hg parents
		changeset: 2:30a83d1e4a1e
		tag: tip
		user: test
		date: Thu Jan 01 00:00:00 1970 +0000
		summary: Added tag default for changeset f7b1eb17ad24