"bzr merge" and "bzr log -n0"

Eli Zaretskii eliz at gnu.org
Sat Aug 28 21:17:59 BST 2010


Running the following script (courtesy of Stephen Turnbull):

  #! /bin/bash
  pushd /tmp; mkdir test; cd test
  mkdir foo; cd foo; bzr init
  addfile () { echo $1 > $1; bzr add $1; bzr commit -m "add $1"; }
  addfile foo
  bzr branch . ../bar
  addfile bar
  addfile baz
  addfile quux
  cd ../bar
  bzr merge -r2..4 ../foo; bzr commit -m merge
  bzr log -n0

the last "bzr log -n0" command shows this:

  2: Eli Zaretskii 2010-08-28 merge
  1: Eli Zaretskii 2010-08-28 add foo

That is, it doesn't show the revisions from foo that were merged.
(The changes specified by -r2..4 are in fact brought to the bar
branch.)  Is it a bug or a feature?  If a feature, why is it a
feature?

TIA



More information about the bazaar mailing list