Bazaar

Code review comment for lp:~gerard-/bzr/update

  1. update
  2. Merge into bzr.dev
Revision history for this message
John A Meinel (jameinel) wrote :

Just a thought....

Maybe what we want is:

if wt.get_parent_ids()[0] != wt.branch.last_revision():
  merge_inner(wt.get_parent_ids()[0] => wt.branch.last_revision())
merge_inner(ancestor(wt.branch.last_revision(), revision), revision)

« Back to merge proposal