problematic_workflow_polly.sh

$ bzr branch bzr+ssh://dev/uiris3/trunk
    Branched from revision 123
$ cd trunk
    # ... hack hack hack (meanwhile Bob commits 124 and Alice commits 125 to shared trunk branch)
$ bzr commit -m "First local checkpoint"
    Committed revision 124
    # ... hack hack hack (meanwhile Bob commits 126 and 127 to shared trunk branch)
$ bzr commit -m "Second local checkpoint"
    Committed revision 125
    # ... hack hack finish (meanwhile Alice commits 128 to shared trunk branch)
$ bzr commit -m "Finishing up, ready to push"
    Committed revision 126
$ bzr push
    ERROR: These branches have diverged. Try using "merge" and then "push".
    # "Oh, okay."
$ bzr log bzr+ssh://dev/uiris3/trunk -r 124.. --line
  124: 2009-03-03 Bob:   Getting Bar feature done
  125: 2009-03-04 Alice: Adding Foo Feature
     ....
  128: 2009-03-04 Bob:   Fixing Baz Bug
$ bzr merge
    Merging revisions 124..128 from bzr+ssh://dev/uiris3/trunk
$ bzr st
  M foo/bar
  M baz
  ....
Pending Merges:
  2009-03-03 Bob:   Getting Bar feature done
  2009-03-04 Alice: Adding Foo Feature
  ....
  2009-03-04 Bob:   Fixing Baz Bug
$ bzr ci -m "Merging trunk"
  Committed revision 127
$ bzr push
  Pushed through revision 127
$ bzr log bzr+ssh://dev/uiris3/trunk -r 124.. --line
  124: 2009-03-03 Polly First local checkpoint
  125: 2009-03-03 Polly Second local checkpoint
  126: 2009-03-03 Polly Finishing up, ready to push
  127: 2009-03-04 Polly Merging Trunk