Grr - my white space got munched. Please see the attached screen shot for a pretty DAG.
Note that this cause bug in other parts of bzr the use the merge_depth. For example, if you run bzr log bzrlib/tag.py, you get:
------------------------------------------------------------ revno: 4193 committer: Canonical.com Patch Queue Manager <email address hidden> branch nick: +trunk timestamp: Tue 2009-03-24 05:12:24 +0000 message: (mbp) merge update to FSF address ------------------------------------------------------------ revno: 4183.7.1 committer: Sabin Iacob <email address hidden> branch nick: bzr.fsf_addr timestamp: Mon 2009-03-23 16:59:43 +0200 message: update FSF mailing address ------------------------------------------------------------ <snip>
4189.1.1 is not there, but it does change bzrlib/tag.py
Grr - my white space got munched. Please see the attached screen shot for a pretty DAG.
Note that this cause bug in other parts of bzr the use the merge_depth. For example, if you run bzr log bzrlib/tag.py, you get:
------- ------- ------- ------- ------- ------- ------- ------- ---- ------- ------- ------- ------- ------- ------- ------- ------- - ------- ------- ------- ------- ------- ------- ------- ----
revno: 4193
committer: Canonical.com Patch Queue Manager <email address hidden>
branch nick: +trunk
timestamp: Tue 2009-03-24 05:12:24 +0000
message:
(mbp) merge update to FSF address
---
revno: 4183.7.1
committer: Sabin Iacob <email address hidden>
branch nick: bzr.fsf_addr
timestamp: Mon 2009-03-23 16:59:43 +0200
message:
update FSF mailing address
-------
<snip>
4189.1.1 is not there, but it does change bzrlib/tag.py