← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Aaron Bentley
  • Date: 2007-11-23 17:40:15 UTC
  • mto: This revision was merged to the branch mainline in revision 3022.
  • Revision ID: abentley@panoramicfeedback.com-20071123174015-qkk7j1olrisxk66b
https://launchpad.net/bugs/136890
merge --uncommit can now specify single files (#136890)

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,