← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-11-25 16:56:33 UTC
  • mfrom: (3017.3.2 merge)
  • Revision ID: pqm@pqm.ubuntu.com-20071125165633-12tp1jm95scstieq
Merge --uncommitted can now specify single files (#136890, Lalinsky)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
2831
2831
                merger = _mod_merge.Merger.from_uncommitted(tree, other_tree,
2832
2832
                    pb)
2833
2833
                allow_pending = False
 
2834
                if other_path != '':
 
2835
                    merger.interesting_files = [other_path]
2834
2836
 
2835
2837
            if merger is None:
2836
2838
                merger, allow_pending = self._get_merger_from_branch(tree,