← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/uncommit.py

  • Committer: John Arbash Meinel
  • Date: 2008-05-29 22:15:28 UTC
  • mto: This revision was merged to the branch mainline in revision 3461.
  • Revision ID: john@arbash-meinel.com-20080529221528-2shky6po8ki0hq25
properly handle when you uncommit back to NULL_REVISION

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/uncommit.py
88
88
            # but we pop from the end, so reverse the order, and
89
89
            # then get the order right at the end
90
90
            pending_merges.extend(reversed(parents[1:]))
 
91
        else:
 
92
            # We ran off the end of revisions, which means we should be trying
 
93
            # to get to NULL_REVISION
 
94
            new_revision_id = _mod_revision.NULL_REVISION
91
95
 
92
96
        if not dry_run:
93
97
            if master is not None: