← 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-21 12:26:54 UTC
  • mto: This revision was merged to the branch mainline in revision 1621.
  • Revision ID: mbp@sourcefrog.net-20060321122654-514047ed65795a17
New developer commands 'weave-list' and 'weave-join'.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/weave.py
1367
1367
        w = readit()
1368
1368
        p = w.plan_merge(int(argv[3]), int(argv[4]))
1369
1369
        sys.stdout.writelines(w.weave_merge(p))
1370
 
            
1371
1370
    else:
1372
1371
        raise ValueError('unknown command %r' % cmd)
1373
1372
    
1374
1373
 
1375
1374
 
1376
 
def profile_main(argv): 
 
1375
def profile_main(argv):
1377
1376
    import tempfile, hotshot, hotshot.stats
1378
1377
 
1379
1378
    prof_f = tempfile.NamedTemporaryFile()