<p>The history is already missing. It is just that bzr0.8.2 didn't notice. We do want to support your use case, though. I suppose the big question is why r156. If you were using 0.8.2, I think it is possible for it to have picked a revision history that didn't match the mainline history.</p>
<p>I don't remember if we have an easy way to fix the revno. I think (bzr reconcile --branch).</p>
<p>John<br>
=:-></p>
<div class="gmail_quote">On Oct 17, 2011 6:15 AM, "Andrew Foster" <<a href="mailto:andy@sol1.com.au">andy@sol1.com.au</a>> wrote:<br type="attribution"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Hi Martin,<br>
<br>
Thanks for the reply. I've upgraded to 2.4.1 and although it changed the wording of the error it seems no more successful:<br>
<br>
$ bzr log<br>
[..]<br>
bzr: ERROR: Revision {Arch-1:ryan@example.com--2005%reponame--ryan--1--patch-5} not present in "Graph(StackedParentsProvider(bzrlib.repository._LazyListJoin(([CachingParentsProvider(CallableToParentsProviderAdapter(<bound method CHKInventoryRepository._get_parent_map_no_fallbacks of CHKInventoryRepository('file:///Users/andy/projects/reponame/.bzr/repository/')>))], []))))".<br>
<br>
>From .bzr.log:<br>
<br>
Mon 2011-10-17 15:05:59 +1100<br>
0.052 bazaar version: 2.4.1<br>
0.052 bzr arguments: [u'log']<br>
0.079 looking for plugins in /Users/andy/.bazaar/plugins<br>
0.079 looking for plugins in /Library/Python/2.6/site-packages/bzrlib/plugins<br>
0.133 encoding stdout as sys.stdout encoding 'UTF-8'<br>
0.182 encoding stdout as sys.stdout encoding 'UTF-8'<br>
0.581 Transferred: 0kB (0.0kB/s r:0kB w:0kB)<br>
0.586 Traceback (most recent call last):<br>
File "/Library/Python/2.6/site-packages/bzrlib/commands.py", line 946, in exception_to_return_code<br>
return the_callable(*args, **kwargs)<br>
File "/Library/Python/2.6/site-packages/bzrlib/commands.py", line 1150, in run_bzr<br>
ret = run(*run_argv)<br>
File "/Library/Python/2.6/site-packages/bzrlib/commands.py", line 699, in run_argv_aliases<br>
return self.run(**all_cmd_args)<br>
File "/Library/Python/2.6/site-packages/bzrlib/commands.py", line 721, in run<br>
return self._operation.run_simple(*args, **kwargs)<br>
File "/Library/Python/2.6/site-packages/bzrlib/cleanup.py", line 135, in run_simple<br>
self.cleanups, self.func, *args, **kwargs)<br>
File "/Library/Python/2.6/site-packages/bzrlib/cleanup.py", line 165, in _do_with_cleanups<br>
result = func(*args, **kwargs)<br>
File "/Library/Python/2.6/site-packages/bzrlib/commands.py", line 1165, in ignore_pipe<br>
result = func(*args, **kwargs)<br>
File "/Library/Python/2.6/site-packages/bzrlib/builtins.py", line 2545, in run<br>
Logger(b, rqst).show(lf)<br>
File "/Library/Python/2.6/site-packages/bzrlib/log.py", line 369, in show<br>
self._show_body(lf)<br>
File "/Library/Python/2.6/site-packages/bzrlib/log.py", line 395, in _show_body<br>
for lr in generator.iter_log_revisions():<br>
File "/Library/Python/2.6/site-packages/bzrlib/log.py", line 434, in iter_log_revisions<br>
for revs in revision_iterator:<br>
File "/Library/Python/2.6/site-packages/bzrlib/log.py", line 984, in _make_revision_objects<br>
for revs in log_rev_iterator:<br>
File "/Library/Python/2.6/site-packages/bzrlib/log.py", line 1009, in _make_batch_filter<br>
step = [detail for _, detail in zip(range(num), batch)]<br>
File "/Library/Python/2.6/site-packages/bzrlib/log.py", line 839, in _convert<br>
for view in view_revisions:<br>
File "/Library/Python/2.6/site-packages/bzrlib/log.py", line 720, in _linear_view_revisions<br>
(_mod_revision.NULL_REVISION,)):<br>
File "/Library/Python/2.6/site-packages/bzrlib/graph.py", line 1002, in iter_lefthand_ancestry<br>
parents = get_parents(next_key)<br>
File "/Library/Python/2.6/site-packages/bzrlib/graph.py", line 998, in get_parents<br>
raise errors.RevisionNotPresent(next_key, self)<br>
RevisionNotPresent: Revision {Arch-1:ryan@example.com--2005%reponame--ryan--1--patch-5} not present in "Graph(KnitsParentsProvider(KnitVersionedFiles(<bzrlib.knit._KndxIndex object at 0x10174d090>, <bzrlib.knit._KnitKeyAccess object at 0x1017cb490>)))".<br>
<br>
0.587 return code 3<br>
<br>
It behaves the same on my up-to-date working tree (format 2a) using 2.4.1, or an old copy in dirstate format.<br>
<br>
I don't mind losing some history though, is there a way to restart the history as of some revision (like 200) as if it was the first commit, and discard the rest? It only seems to be having trouble with some of the oldest patches.<br>
<br>
- Andy<br>
<br>
<br>
On 17/10/2011, at 2:17 PM, Martin Pool wrote:<br>
<br>
> Hi Andy,<br>
><br>
> This looks like bug 397556, which was fixed in bzr 2.4. If that<br>
> doesn't fix it please let us know.<br>
><br>
> duplicate 397556<br>
<br>
<br>
</blockquote></div>