← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/weave.py

  • Committer: Martin Pool
  • Date: 2006-03-24 11:12:04 UTC
  • mto: This revision was merged to the branch mainline in revision 1626.
  • Revision ID: mbp@sourcefrog.net-20060324111204-447e9b834705153f
New 'weave-plan-merge' and 'weave-merge-text' commands lifted from weave.py

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/weave.py
1358
1358
        print ' '.join(map(str, w._parents[int(argv[3])]))
1359
1359
 
1360
1360
    elif cmd == 'plan-merge':
 
1361
        # replaced by 'bzr weave-plan-merge'
1361
1362
        w = readit()
1362
1363
        for state, line in w.plan_merge(int(argv[3]), int(argv[4])):
1363
1364
            if line:
1364
1365
                print '%14s | %s' % (state, line),
1365
 
 
1366
1366
    elif cmd == 'merge':
 
1367
        # replaced by 'bzr weave-merge-text'
1367
1368
        w = readit()
1368
1369
        p = w.plan_merge(int(argv[3]), int(argv[4]))
1369
1370
        sys.stdout.writelines(w.weave_merge(p))