merge_depth from merge_sorted_revisions incorrect.
Bug #350796 reported by
Gary van der Merwe
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Bazaar |
Fix Released
|
Undecided
|
John A Meinel |
Bug Description
I think that the merge_depth field returned from merge_sorted_
To make it easy to investigate this, I created a branch of qlog that displays the merge depth. The branch is at lp:~qbzr-dev/qbzr/show-merge-depth. I've attached a screen shot of this.
If you look at the following revisions in bzr.dev:
4193
4189.1.1
4183.7.1
The dag and merge depths look like this:
Rev No DAG Merge Depth
4193 * 0
- |\
4189.1.1 | * 1
- | |\
4183.7.1 | | * 1
- | | |
- | | |
- |/ |
- | |
- | /
- |/
Shouldn't the merge depth for 4183.7.1 be 2?
Changed in bzr: | |
milestone: | none → 2.0 |
To post a comment you must log in.
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