/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/merge_directive.py

  • Committer: John Arbash Meinel
  • Date: 2009-10-29 21:13:16 UTC
  • mfrom: (4634.77.13 2.0)
  • mto: This revision was merged to the branch mainline in revision 4777.
  • Revision ID: john@arbash-meinel.com-20091029211316-d70fv1sxe2ev9rhy
Merge bzr.2.0 bringing in a bunch of small bugfixes.

Stuff like the ObjectNotLocked failures, reverting contents in the presence
of filters, etc.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge_directive.py
582
582
                    revision_id):
583
583
                    raise errors.PublicBranchOutOfDate(public_branch,
584
584
                                                       revision_id)
 
585
            testament_sha1 = t.as_sha1()
585
586
        finally:
586
587
            for entry in reversed(locked):
587
588
                entry.unlock()
588
 
        return klass(revision_id, t.as_sha1(), time, timezone, target_branch,
589
 
            patch, public_branch, message, bundle, base_revision_id)
 
589
        return klass(revision_id, testament_sha1, time, timezone,
 
590
            target_branch, patch, public_branch, message, bundle,
 
591
            base_revision_id)
590
592
 
591
593
    def _verify_patch(self, repository):
592
594
        calculated_patch = self._generate_diff(repository, self.revision_id,