tests/test-branch-tag-confict.t
changeset 14162 301725c3df9a
parent 13750 7eb82f88e157
child 15615 41885892796e
equal deleted inserted replaced
14161:8a0fca925992 14162:301725c3df9a
    17   $ hg ci -m 'Create a branch with the same name as a tag.'
    17   $ hg ci -m 'Create a branch with the same name as a tag.'
    18 
    18 
    19 This is what we have:
    19 This is what we have:
    20 
    20 
    21   $ hg log
    21   $ hg log
    22   changeset:   2:02b1af9b58c2
    22   changeset:   2:10519b3f489a
    23   branch:      branchortag
    23   branch:      branchortag
    24   tag:         tip
    24   tag:         tip
    25   user:        test
    25   user:        test
    26   date:        Thu Jan 01 00:00:00 1970 +0000
    26   date:        Thu Jan 01 00:00:00 1970 +0000
    27   summary:     Create a branch with the same name as a tag.
    27   summary:     Create a branch with the same name as a tag.
    51 Updating to the branch:
    51 Updating to the branch:
    52 
    52 
    53   $ hg up 'branch(branchortag)'
    53   $ hg up 'branch(branchortag)'
    54   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
    54   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
    55   $ hg parents
    55   $ hg parents
    56   changeset:   2:02b1af9b58c2
    56   changeset:   2:10519b3f489a
    57   branch:      branchortag
    57   branch:      branchortag
    58   tag:         tip
    58   tag:         tip
    59   user:        test
    59   user:        test
    60   date:        Thu Jan 01 00:00:00 1970 +0000
    60   date:        Thu Jan 01 00:00:00 1970 +0000
    61   summary:     Create a branch with the same name as a tag.
    61   summary:     Create a branch with the same name as a tag.