~bzr-pqm/bzr/bzr.dev

Viewing changes to bzrlib/branch.py

Committer: John Arbash Meinel
Date: 2005-12-01 14:57:05 UTC
mto: (1185.69.1 bzr-storage) (1534.1.1 integration) (1505.1.30 bzr-bound-branch) (1553.5.1 bzr.dev (Main development branch)) (1608.2.1 bzr.mbp.escape-stores)
mto: This revision was merged to the branch mainline in revision 1519.
Revision ID: john@arbash-meinel.com-20051201145705-28071de6fbc274af

pull --overwrite should always overwrite, not just if diverged. (Test case from Robey Pointer)

added added

removed removed

1026

except DivergedBranches:

1027

if not overwrite:

1028

raise

1029

if overwrite:

1029

1030

self.set_revision_history(source.revision_history())

1030

1031

new_count = len(self.revision_history())

1031

1032

return new_count - old_count