← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/plugins/conflicts.py

  • Committer: Aaron Bentley
  • Date: 2005-10-01 06:36:44 UTC
  • mto: (1185.12.13)
  • mto: This revision was merged to the branch mainline in revision 1419.
  • Revision ID: aaron.bentley@utoronto.ca-20051001063644-a11b512d35444b89
Fixed relpath bug with resolve

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/conflicts.py
59
59
                raise BzrCommandError(
60
60
                    "command 'resolve' needs one or more FILE, or --all")
61
61
            tree = Branch.open_containing('.').working_tree()
62
 
            file_list = list(iter_conflicts(tree))
 
62
            file_list = list(tree.abspath(f) for f in iter_conflicts(tree))
63
63
        else:
64
64
            if all:
65
65
                raise BzrCommandError(