← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

- fix up imports in remotebranch

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
92
92
    takes_args = ['revision_id']
93
93
    
94
94
    def run(self, revision_id):
95
 
        from bzrlib.xml import pack_xml
96
 
        pack_xml(find_branch('.').get_revision(revision_id), sys.stdout)
 
95
        b = find_branch('.')
 
96
        sys.stdout.write(b.get_revision_xml_file(revision_id).read())
97
97
 
98
98
 
99
99
class cmd_revno(Command):
103
103
    def run(self):
104
104
        print find_branch('.').revno()
105
105
 
 
106
 
106
107
class cmd_revision_info(Command):
107
108
    """Show revision number and revision id for a given revision identifier.
108
109
    """
535
536
    examples:
536
537
        bzr diff
537
538
        bzr diff -r1
538
 
        bzr diff -r1:2
 
539
        bzr diff -r1..2
539
540
    """
540
541
    
541
542
    takes_args = ['file*']
1196
1197
        try:
1197
1198
            merge(other, base, check_clean=(not force), merge_type=merge_type)
1198
1199
        except bzrlib.errors.AmbiguousBase, e:
1199
 
            m = ("sorry, bzr can't determine the write merge base yet\n"
 
1200
            m = ("sorry, bzr can't determine the right merge base yet\n"
1200
1201
                 "candidates are:\n  "
1201
1202
                 + "\n  ".join(e.bases)
1202
1203
                 + "\n"