← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commit.py

  • Committer: Martin Pool
  • Date: 2005-07-04 11:57:18 UTC
  • Revision ID: mbp@sourcefrog.net-20050704115718-b532986c0714e7a7
- don't write precursor field in new revision xml
- make parents more primary; remove more precursor code
- test commit of revision with parents

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
143
143
                       inventory_sha1=inv_sha1,
144
144
                       revision_id=rev_id)
145
145
 
 
146
        rev.parents = []
146
147
        precursor_id = branch.last_patch()
147
148
        if precursor_id:
148
149
            precursor_sha1 = branch.get_revision_sha1(precursor_id)
149
 
            rev.parents = [RevisionReference(precursor_id, precursor_sha1)]
 
150
            rev.parents.append(RevisionReference(precursor_id, precursor_sha1))
 
151
        for merge_rev in pending_merges:
 
152
            rev.parents.append(RevisionReference(merge_rev))            
150
153
 
151
154
        rev_tmp = tempfile.TemporaryFile()
152
155
        pack_xml(rev, rev_tmp)