← 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: 2006-07-12 12:36:57 UTC
  • mfrom: (1732.3.4 bzr.revnoX)
  • Revision ID: pqm@pqm.ubuntu.com-20060712123657-365eeb32b69308bf
(matthieu) revno:x:url revision spec

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
1142
1142
                # FIXME diff those two files. rbc 20051123
1143
1143
                raise BzrCommandError("Files are in different branches")
1144
1144
            file_list = None
 
1145
        except NotBranchError:
 
1146
            # Don't raise an error when bzr diff is called from
 
1147
            # outside a working tree.
 
1148
            tree1, tree2 = None, None
1145
1149
        if revision is not None:
1146
1150
            if tree2 is not None:
1147
1151
                raise BzrCommandError("Can't specify -r with two branches")