Mercurial > hg
annotate tests/test-issue1438 @ 8954:e67e5b60e55f
Branch heads should not include "heads" that are ancestors of other heads.
For example, given 1 (branch a) -> 2 (branch b) -> 3 (branch a)
I expect "hg heads a" to show only 3.
Discovered by running hg heads HEAD on the mutt repo, where older clients
committed default on top of HEAD.
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Mon, 29 Jun 2009 00:54:23 -0700 |
parents | 2c5b2abfb8be |
children |
rev | line source |
---|---|
7783
2c5b2abfb8be
patch: teach selectfile about symlinks (issue1438)
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
1 #!/bin/sh |
2c5b2abfb8be
patch: teach selectfile about symlinks (issue1438)
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
2 "$TESTDIR/hghave" symlink || exit 80 |
2c5b2abfb8be
patch: teach selectfile about symlinks (issue1438)
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
3 |
2c5b2abfb8be
patch: teach selectfile about symlinks (issue1438)
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
4 rm -rf a |
2c5b2abfb8be
patch: teach selectfile about symlinks (issue1438)
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
5 hg init a |
2c5b2abfb8be
patch: teach selectfile about symlinks (issue1438)
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
6 cd a |
2c5b2abfb8be
patch: teach selectfile about symlinks (issue1438)
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
7 |
2c5b2abfb8be
patch: teach selectfile about symlinks (issue1438)
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
8 ln -s foo link |
2c5b2abfb8be
patch: teach selectfile about symlinks (issue1438)
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
9 hg add link |
2c5b2abfb8be
patch: teach selectfile about symlinks (issue1438)
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
10 hg ci -mbad link |
2c5b2abfb8be
patch: teach selectfile about symlinks (issue1438)
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
11 hg rm link |
2c5b2abfb8be
patch: teach selectfile about symlinks (issue1438)
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
12 hg ci -mok |
2c5b2abfb8be
patch: teach selectfile about symlinks (issue1438)
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
13 hg diff -g -r 0:1 > bad.patch |
2c5b2abfb8be
patch: teach selectfile about symlinks (issue1438)
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
14 hg up 0 |
2c5b2abfb8be
patch: teach selectfile about symlinks (issue1438)
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
15 hg import --no-commit bad.patch |
2c5b2abfb8be
patch: teach selectfile about symlinks (issue1438)
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
16 hg st |