← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

[merge] sftp fixes

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
        if verbose:
400
401
            new_rh = tree_to.branch.revision_history()
401
402
            if old_rh != new_rh:
486
487
        if br_from.get_push_location() is None or remember:
487
488
            br_from.set_push_location(location)
488
489
        note('%d revision(s) pushed.' % (count,))
 
490
 
489
491
        if verbose:
490
492
            new_rh = br_to.revision_history()
491
493
            if old_rh != new_rh:
1271
1273
            raise BzrCommandError("Commit refused because there are unknown "
1272
1274
                                  "files in the working tree.")
1273
1275
        note('Committed revision %d.' % (tree.branch.revno(),))
1274
 
        
 
1276
 
1275
1277
 
1276
1278
class cmd_check(Command):
1277
1279
    """Validate consistency of branch history.