← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to __init__.py

  • Committer: Aaron Bentley
  • Date: 2006-06-15 02:18:03 UTC
  • mfrom: (392.1.3 bzrtools)
  • Revision ID: aaron.bentley@utoronto.ca-20060615021803-561b01a755279dd9
Add shove, update news

Show diffs side-by-side

added added

removed removed

Lines of Context:
__init__.py
450
450
        from upstream_import import do_import
451
451
        do_import(source, tree)
452
452
 
 
453
class cmd_shove(bzrlib.commands.Command):
 
454
    """Apply uncommitted changes to another tree <BZRTOOLS>
 
455
    
 
456
    This is useful when you start to make changes in one tree, then realize
 
457
    they should really be done in a different tree.
 
458
 
 
459
    Shove is implemented using merge, so:
 
460
     - All changes, including renames and adds, will be applied.
 
461
     - No changes that have already been applied will be applied.
 
462
     - If the target is significantly different from the source, conflicts may
 
463
       be produced.
 
464
    """
 
465
 
 
466
    takes_args = ['target', 'source?']
 
467
    def run(self, target, source='.'):
 
468
        from shove import do_shove
 
469
        do_shove(source, target)
 
470
 
453
471
 
454
472
commands = [cmd_shelve, cmd_unshelve, cmd_shelf, cmd_clean_tree,
455
473
            cmd_graph_ancestry, cmd_fetch_ghosts, cmd_patch, cmd_shell,
456
474
            cmd_branch_history, cmd_zap, cmd_cbranch, cmd_branches, 
457
 
            cmd_multi_pull, cmd_switch, cmd_branch_mark, cmd_import]
 
475
            cmd_multi_pull, cmd_switch, cmd_branch_mark, cmd_import, cmd_shove]
458
476
 
459
477
 
460
478
import bzrlib.builtins