← 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-08-14 13:34:01 UTC
  • mfrom: (0.7.3 shelf-dev)
  • Revision ID: abentley@panoramicfeedback.com-20060814133401-5f4158ff6fa20347
Merge latest changes from Shelf

Show diffs side-by-side

added added

removed removed

Lines of Context:
__init__.py
20
20
sys.path.insert(0, os.path.realpath(os.path.join(os.path.dirname(__file__), 
21
21
                                                 "external")))
22
22
 
23
 
bzrlib.ignores.add_runtime_ignores(['./.shelf', './.bzr-shelf*'])
 
23
bzrlib.ignores.add_runtime_ignores(['./.shelf'])
24
24
 
25
25
 
26
26
class cmd_clean_tree(bzrlib.commands.Command):
134
134
 
135
135
        return patch(wt, filename, strip, legacy= not bzrdiff)
136
136
 
 
137
 
137
138
class cmd_shelve(bzrlib.commands.Command):
138
139
    """Temporarily set aside some changes from the current tree.
139
140
 
159
160
    you can also unshelve changes in a different order by explicitly
160
161
    specifiying which changes to unshelve. This works best when the changes
161
162
    don't depend on each other.
 
163
 
 
164
    While you have patches on the shelf you can view and manipulate them with
 
165
    the 'shelf' command. Run 'bzr shelf -h' for more info.
162
166
    """
163
167
 
164
168
    takes_args = ['file*']