/brz/remove-bazaar : revision 1927.2.1

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/export/dir_exporter.py

Committer: Robert Collins
Date: 2006-08-17 03:35:26 UTC
mto: (1908.5.8 combine set_last_revision and set_pending_merges.)
mto: This revision was merged to the branch mainline in revision 1971.
Revision ID: robertc@robertcollins.net-20060817033526-d36c591bf3d93152

Alter set_pending_merges to shove the left most merge into the trees last-revision if that is not set. Related bugfixes include basis_tree handling ghosts, de-duping the merges with the last-revision and update changing where and how it adds its pending merge.