← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

[merge] Robey Pointer - some sftp fixes, and an http patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
395
395
                                  "  Try merge.")
396
396
        if br_to.get_parent() is None or remember:
397
397
            br_to.set_parent(location)
398
 
        note('%d revision(s) pulled.', count)
 
398
        note('%d revision(s) pulled.' % (count,))
399
399
 
400
400
        if verbose:
401
401
            new_rh = tree_to.branch.revision_history()
1273
1273
            raise BzrCommandError("Commit refused because there are unknown "
1274
1274
                                  "files in the working tree.")
1275
1275
        note('Committed revision %d.' % (tree.branch.revno(),))
1276
 
        
 
1276
 
1277
1277
 
1278
1278
class cmd_check(Command):
1279
1279
    """Validate consistency of branch history.