/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to tools/trace-revisions

  • Committer: John Arbash Meinel
  • Date: 2009-04-29 17:02:36 UTC
  • mto: This revision was merged to the branch mainline in revision 4322.
  • Revision ID: john@arbash-meinel.com-20090429170236-v1oe7b235mi73cqs
https://launchpad.net/bugs/328171
Add a per-implementation test that deleting lines conflicts with modifying lines.

At the moment, I don't see a simple way to implement this for LCA merge,
so I'm just marking it as 'expectedFailure'.
However, it works for both Weave merge and for Merge3.
Fixes bug #328171

Show diffs side-by-side

added added

removed removed

Lines of Context:
tools/trace-revisions
 
1
#! /usr/bin/env python
 
2
 
 
3
import sys
 
4
 
 
5
from bzrlib.branch import Branch
 
6
 
 
7
b = Branch.open('.')
 
8
rev_id = sys.argv[1]
 
9
rh = []
 
10
while True:
 
11
    rh.append(rev_id)
 
12
    rev = b.get_revision(rev_id)
 
13
    if rev.parent_ids:
 
14
        rev_id = rev.parent_ids[0]
 
15
    else:
 
16
        break
 
17
rh.reverse()
 
18
for rev_id in rh:
 
19
    print rev_id