upstream/mercurial-mirror Files · tests/test-branch-tag-confict.t

changegroup: introduce safeversion()...

changegroup: introduce safeversion() In a few places (at least repair.py and shelve.py), we want to find the best changegroup version that we can assume users of the repo will understand. For example, we choose version 01 by default, but if it's a generaldelta repo, we expect clients to support version 02 anyway, so we choose that for new bundles (for e.g. "hg strip"). Let's create a helper for this functionality in changegroup, so we can reuse it elsewhere later.

Mads Kiilerich - - Load All Authors

File last commit:

r16913:f2719b38 default


                r27929:3b2ac211

stable

Download file

             test-branch-tag-confict.t
        
                    65 lines
            
             | 1.6 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-branch-tag-confict.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      Initial setup.

        $ hg init repo

        $ cd repo

        $ touch thefile

        $ hg ci -A -m 'Initial commit.'

        adding thefile

      Create a tag.

        $ hg tag branchortag

      Create a branch with the same name as the tag.

        $ hg branch branchortag

        marked working directory as branch branchortag

        (branches are permanent and global, did you want a bookmark?)

        $ hg ci -m 'Create a branch with the same name as a tag.'

      This is what we have:

        $ hg log

        changeset:   2:10519b3f489a

        branch:      branchortag

        tag:         tip

        user:        test

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

        summary:     Create a branch with the same name as a tag.

        changeset:   1:2635c45ca99b

        user:        test

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

        summary:     Added tag branchortag for changeset f57387372b5d

        changeset:   0:f57387372b5d

        tag:         branchortag

        user:        test

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

        summary:     Initial commit.

      Update to the tag:

        $ hg up 'tag(branchortag)'

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

        $ hg parents

        changeset:   0:f57387372b5d

        tag:         branchortag

        user:        test

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

        summary:     Initial commit.

      Updating to the branch:

        $ hg up 'branch(branchortag)'

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

        $ hg parents

        changeset:   2:10519b3f489a

        branch:      branchortag

        tag:         tip

        user:        test

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

        summary:     Create a branch with the same name as a tag.

        $ 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

				Initial setup.

				$ hg init repo
				$ cd repo
				$ touch thefile
				$ hg ci -A -m 'Initial commit.'
				adding thefile

				Create a tag.

				$ hg tag branchortag

				Create a branch with the same name as the tag.

				$ hg branch branchortag
				marked working directory as branch branchortag
				(branches are permanent and global, did you want a bookmark?)
				$ hg ci -m 'Create a branch with the same name as a tag.'

				This is what we have:

				$ hg log
				changeset: 2:10519b3f489a
				branch: branchortag
				tag: tip
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: Create a branch with the same name as a tag.

				changeset: 1:2635c45ca99b
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: Added tag branchortag for changeset f57387372b5d

				changeset: 0:f57387372b5d
				tag: branchortag
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: Initial commit.

				Update to the tag:

				$ hg up 'tag(branchortag)'
				0 files updated, 0 files merged, 1 files removed, 0 files unresolved
				$ hg parents
				changeset: 0:f57387372b5d
				tag: branchortag
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: Initial commit.

				Updating to the branch:

				$ hg up 'branch(branchortag)'
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ hg parents
				changeset: 2:10519b3f489a
				branch: branchortag
				tag: tip
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: Create a branch with the same name as a tag.


				$ cd ..