--- a/mercurial/commands.py Sat Feb 06 12:47:17 2010 +0100
+++ b/mercurial/commands.py Sat Feb 06 12:47:24 2010 +0100
@@ -1431,16 +1431,12 @@
heads = []
visitedset = set()
for b in branches:
- bheads = repo.branchheads(branch, start, closed=closed)
+ bheads = repo.branchheads(b, start, closed=closed)
if not bheads:
encodedbranch = encode(b)
if not opts.get('rev'):
ui.warn(_("no open branch heads on branch %s\n")
% encodedbranch)
- elif branch != branchrev:
- ui.warn(_("no changes on branch %s containing %s are "
- "reachable from %s\n")
- % (encodedbranch, branchrev, opts.get('rev')))
else:
ui.warn(_("no changes on branch %s are reachable from %s\n")
% (encodedbranch, opts.get('rev')))
--- a/tests/test-bheads.out Sat Feb 06 12:47:17 2010 +0100
+++ b/tests/test-bheads.out Sat Feb 06 12:47:24 2010 +0100
@@ -56,7 +56,7 @@
-------
7: Adding c branch
=======
-no changes on branch c containing . are reachable from 3
+no changes on branch c are reachable from 3
1
-------
7: Adding c branch
@@ -72,7 +72,7 @@
3: Adding b branch head 1
0
-------
-no changes on branch b containing . are reachable from 7
+no changes on branch b are reachable from 7
1
=======
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
@@ -149,6 +149,6 @@
=======
0: Adding root node
1: Adding a branch
+7: Adding c branch
6: Merging b branch head 2 and b branch head 3
3: Adding b branch head 1
-7: Adding c branch