i$ mkdir up
i$ cd up
up$ bzr init
up$ cp /etc/hosts .
up$ bzr add
added hosts
up$ bzr ci -m hosts
added hosts
Committed revision 1.
up$ cd ..
i$ bzr checkout up ch
- [                                                           ] fetch phase 0/4Inventory ok.
i$ cd ch
ch$ echo hej >> hosts
ch$ bzr ci -m hej
modified/renamed/reparented hosts
- [                                                           ] fetch phase 0/4Inventory ok.
Committed revision 2.
ch$ cd ../up
up$ bzr uncommit
    2 Erik Bågfors      2006-03-30
      hej

The above revision(s) will be removed.
Are you sure [y/N]? y
up$ cd ../ch
ch$ bzr ci --unchanged -m fo
bzr: ERROR: Bound branch BzrBranch5(u'/tmp/i/ch/') is out of date with master branch BzrBranch(u'/tmp/i/up/'). Either unbind, update, or pass --local to commit.[Exit 3 ]
ch$ bzr update
All changes applied successfully.
All changes applied successfully.
Updated to revision 1.
ch$ bzr st
modified:
  hosts
pending merges:
  Erik Bågfors 2006-03-30 hej
ch$ bzr ci -m merge
- [===============                                            ] fetch phase 1/4Inventory ok.
Committed revision 2.
ch$ bzr log
------------------------------------------------------------
revno: 2
committer: Erik Bågfors <erik@bagfors.nu>
branch nick: ch
timestamp: Thu 2006-03-30 16:33:21 +0200
message:
  merge
    ------------------------------------------------------------
    merged: erik@bagfors.nu-20060330143239-880c6bb58985e2c6
    committer: Erik Bågfors <erik@bagfors.nu>
    branch nick: ch
    timestamp: Thu 2006-03-30 16:32:39 +0200
    message:
      hej
------------------------------------------------------------
revno: 1
committer: Erik Bågfors <erik@bagfors.nu>
branch nick: up
timestamp: Thu 2006-03-30 16:32:11 +0200
message:
  hosts