Mercurial > hg
comparison tests/test-branch-tag-confict.t @ 14162:301725c3df9a
localrepo: reuse parent manifest in commitctx if no files have changed
This speeds up the in-memory version of debugbuilddag that I'm
working on considerably for the case where we want to build just
a 00changelog.i (for discovery tests, for instance).
There are a couple of test changes because node ids in tests
have changed.
The changes to the patch names in test-mq-qdelete.t were required
because they could collide with nodeid abbreviations and newly
actually do (patch "c" collides with id "cafe..." for patch "b").
author | Peter Arrenbrecht <peter.arrenbrecht@gmail.com> |
---|---|
date | Mon, 02 May 2011 19:20:29 +0200 |
parents | 7eb82f88e157 |
children | 41885892796e |
comparison
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. |