bug#5323: 23.1.91; VC-dir with bzr gives a lot of junk

[Dan Nicolaescu]

Jan Djärv <jan.h.d@swipnet.se> writes:

  > It looks like the latest checkin logs.  My ~/.nzr-log says it runs
  > % bzr status -v -S ./
  > 
  > and if I do that on the command line I get (not the same now, because
  > I've merged from the trunk again):
  > 
  > ?   cmd
  > ?   upd
  >  M  lisp/ChangeLog
  >  M  lisp/vc-bzr.el
  >  M  lisp/gnus/ChangeLog
  >  M  lisp/gnus/gnus-art.el
  >  M  lisp/gnus/gnus-sum.el
  >  M  lisp/gnus/gnus-util.el
  >  M  lisp/gnus/message.el
  >  M  lisp/progmodes/python.el
  > ?   src/.BAK.xterm.c
  > ?   src/tag-files
  > ?   src/xx.el
  > P   Katsumi Yamaoka 2010-01-06 [merge] * gnus-art.el 
(gnus-article-describe-...
  > P.   Katsumi Yamaoka 2010-01-06 [merge] Merge from mainline.
  > P.   Katsumi Yamaoka 2010-01-06 [merge] * gnus-util.el (gnus-invisible-p, 
gn...
  > P.   Katsumi Yamaoka 2010-01-06 Merge from mainline.
  > P.   Chong Yidong 2010-01-05 * progmodes/python.el 
(python-font-lock-keyword...
  > P.   Dan Nicolaescu 2010-01-05 (vc-bzr-working-revision): Fix looking for a 
...
  > P.   Andreas Schwab 2010-01-05 Fix gnus-summary-recenter to properly handle 
...
  > P.   Jan D. 2010-01-05 [merge] Handle internal-border width changes when 
max...
  > 
  > Those lines starting with P. shows up as nil ... lines in vc-dir.  The
  > docs says they are pending merges.  If I commit those, the junk lines
  > go away.
  > 
  > So pending merges outputted by bzr status isn't handled well

Thanks, that was it.  I checked it a fix.