diff tests/test-log.t @ 23509:32e68271a037

merge with stable

--- a/tests/test-log.t	Tue Dec 09 12:39:23 2014 -0600
+++ b/tests/test-log.t	Tue Dec 09 13:32:19 2014 -0600
@@ -1543,3 +1543,24 @@
   
 
   $ cd ..
+
+hg log -f dir across branches
+
+  $ hg init acrossbranches
+  $ cd acrossbranches
+  $ mkdir d
+  $ echo a > d/a && hg ci -Aqm a
+  $ echo b > d/a && hg ci -Aqm b
+  $ hg up -q 0
+  $ echo b > d/a && hg ci -Aqm c
+  $ hg log -f d -T '{desc}' -G
+  @  c
+  |
+  o  a
+  
+  $ hg log -f d/a -T '{desc}' -G
+  o  b
+  |
+  o  a
+  
+  $ cd ..