← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: John Arbash Meinel
  • Date: 2005-07-11 18:55:52 UTC
  • mto: (1185.11.1)
  • mto: This revision was merged to the branch mainline in revision 1396.
  • Revision ID: john@arbash-meinel.com-20050711185552-454df52dfb3fae1b
Updated bzr set-pending-merges to use transport.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
1227
1227
 
1228
1228
 
1229
1229
    def set_pending_merges(self, rev_list):
1230
 
        from bzrlib.atomicfile import AtomicFile
1231
1230
        self.lock_write()
1232
1231
        try:
1233
 
            f = AtomicFile(self.controlfilename('pending-merges'))
1234
 
            try:
1235
 
                for l in rev_list:
1236
 
                    print >>f, l
1237
 
                f.commit()
1238
 
            finally:
1239
 
                f.close()
 
1232
            self.transport.put(self._rel_controlfilename('pending-merges'),
 
1233
                    '\n'.join(rev_list))
1240
1234
        finally:
1241
1235
            self.unlock()
1242
1236