163
163
result.old_revno, result.old_revid = self.target.last_revision_info()
166
167
# This just handles simple cases, but that's good enough for tests
167
168
my_history = self.target.revision_history()
168
169
if stop_revision is None:
169
170
stop_revision = self.source.last_revision()
173
174
if their_history[:min(len(my_history), len(their_history))] != my_history:
174
175
raise errors.DivergedBranches(self.target, self.source)