/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/branch.py

  • Committer: Martin Pool
  • Date: 2007-03-01 07:15:55 UTC
  • mfrom: (2308 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2309.
  • Revision ID: mbp@sourcefrog.net-20070301071555-lalebdbi2pltrdnj
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
1451
1451
                if not overwrite:
1452
1452
                    raise
1453
1453
            if overwrite:
1454
 
                self.set_revision_history(source.revision_history())
 
1454
                if stop_revision is None:
 
1455
                    stop_revision = source.last_revision()
 
1456
                self.generate_revision_history(stop_revision)
1455
1457
            result.tag_conflicts = source.tags.merge_to(self.tags)
1456
1458
            result.new_revno, result.new_revid = self.last_revision_info()
1457
1459
            if _hook_master: