* vc/vc-bzr.el (vc-bzr-print-log): Improve START-REVISION with LIMIT != 1.

Fixes: debbugs:14168

2 files changed, 10 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index dd562cd4eb4..0fb21997226 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,6 @@
 2013-04-24  Glenn Morris  <rgm@gnu.org>
 
+        * vc/vc-bzr.el (vc-bzr-print-log):
         * vc/vc-hg.el (vc-hg-print-log):
         * vc/vc-svn.el (vc-svn-print-log):
         Fix START-REVISION with LIMIT != 1.  (Bug#14168)
diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el
index d01fcede4be..06942ad283c 100644
--- a/lisp/vc/vc-bzr.el
+++ b/lisp/vc/vc-bzr.el
@@ -712,6 +712,15 @@ If LIMIT is non-nil, show no more than this many entries."
             (when shortlog '("--line"))
             (when start-revision (list (format "-r..%s" start-revision)))
             (when limit (list "-l" (format "%s" limit)))
+            ;; This is to remove --forward, if it has been added by an alias.
+            ;; There is no sensible way to combine --limit and --forward,
+            ;; and it breaks the meaning of START-REVISION as the
+            ;; _newest_ revision.  See bug#14168.
+            ;; FIXME There may be other alias stuff we want to keep.
+            ;; Is there a way to just suppress --forward?
+            ;; As of 2013/4 the only caller uses limit = 1, so it does
+            ;; not matter much.
+            (and start-revision limit (> limit 1) '("--no-aliases"))
             (if (stringp vc-bzr-log-switches)
                 (list vc-bzr-log-switches)
               vc-bzr-log-switches)))))