← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: John Arbash Meinel
  • Date: 2009-11-05 20:08:36 UTC
  • mfrom: (4787 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4788.
  • Revision ID: john@arbash-meinel.com-20091105200836-8e5jfn2h6l2ndh67
Merge bzr.dev 4787 and resolve NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
655
655
        if base_tree:
656
656
            base_tree.lock_read()
657
657
        try:
658
 
            file_list = self._maybe_expand_globs(file_list)
659
658
            tree, file_list = tree_files_for_add(file_list)
660
659
            added, ignored = tree.smart_add(file_list, not
661
660
                no_recurse, action=action, save=not dry_run)