← 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-05-12 23:48:49 UTC
  • mfrom: (1704.2.13 bzr.mbp.integration)
  • Revision ID: pqm@pqm.ubuntu.com-20060512234849-259ff209fff58489
(mbp) various fixes

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
1580
1580
        # TODO: if the commit *does* happen to fail, then save the commit 
1581
1581
        # message to a temporary file where it can be recovered
1582
1582
        tree, selected_list = tree_files(selected_list)
 
1583
        if selected_list == ['']:
 
1584
            # workaround - commit of root of tree should be exactly the same
 
1585
            # as just default commit in that tree, and succeed even though
 
1586
            # selected-file merge commit is not done yet
 
1587
            selected_list = []
 
1588
 
1583
1589
        if local and not tree.branch.get_bound_location():
1584
1590
            raise errors.LocalRequiresBoundBranch()
1585
1591
        if message is None and not file:
2394
2400
class cmd_uncommit(bzrlib.commands.Command):
2395
2401
    """Remove the last committed revision.
2396
2402
 
2397
 
    By supplying the --all flag, it will not only remove the entry 
2398
 
    from revision_history, but also remove all of the entries in the
2399
 
    stores.
2400
 
 
2401
2403
    --verbose will print out what is being removed.
2402
2404
    --dry-run will go through all the motions, but not actually
2403
2405
    remove anything.