← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to shove.py

  • Committer: Aaron Bentley
  • Date: 2006-08-28 12:52:09 UTC
  • Revision ID: abentley@panoramicfeedback.com-20060828125209-4180d820975bb0fb
Deprecate shove

Show diffs side-by-side

added added

removed removed

Lines of Context:
shove.py
21
21
from bzrlib.errors import NoSuchFile
22
22
from bzrlib.workingtree import WorkingTree
23
23
from bzrlib.merge import merge_inner
 
24
from bzrlib import trace
24
25
 
25
26
def do_shove(source, target):
 
27
    trace.warning('Shove is deprecated.  See merge --uncommitted.')
26
28
    if not os.path.exists(source):
27
29
        raise NoSuchFile(source)
28
30
    if not os.path.exists(target):