pruning history from branch - rebase?

[David Reitter]

John,

On Mar 20, 2009, at 7:24 PM, John Arbash Meinel wrote:
>
> bzr init
> bzr commit -m "initial null revision"
> bzr merge -r0..-1 ../big-project
> bzr revert --forget-merges
> bzr commit
>

Well, I tried something like this and got an error:

bzr init --1.9-rich-root
bzr commit -m "initial null revision" --unchanged

~/Projects/Bazaar-Playground/emacs-dl/a-e$ bzr merge -r0..80000 ../ 
emacs/trunk/
[/                   ] Transferring:Walking content. 80000/80000
                                                                                                bzr 
: ERROR: not well-formed (invalid token): line 16, column 56


NB, the upstream branch is in pack-0.92 format.  Trace below.  I'll  
file a bug report if it helps - let me know.

- David






from .bzr.log:

4030.344  Traceback (most recent call last):
   File "/Library/Python/2.5/site-packages/bzrlib/commands.py", line  
716, in exception_to_return_code
     return the_callable(*args, **kwargs)
   File "/Library/Python/2.5/site-packages/bzrlib/commands.py", line  
911, in run_bzr
     ret = run(*run_argv)
   File "/Library/Python/2.5/site-packages/bzrlib/commands.py", line  
547, in run_argv_aliases
     return self.run(**all_cmd_args)
   File "/Library/Python/2.5/site-packages/bzrlib/plugins/qbzr/lib/ 
commands.py", line 632, in run
     return bzrlib.builtins.cmd_merge.run(self, *args, **kw)
   File "/Library/Python/2.5/site-packages/bzrlib/builtins.py", line  
3420, in run
     location, revision, remember, possible_transports, pb)
   File "/Library/Python/2.5/site-packages/bzrlib/builtins.py", line  
3527, in _get_merger_from_branch
     other_revision_id, base_revision_id, other_branch, base_branch)
   File "/Library/Python/2.5/site-packages/bzrlib/merge.py", line 204,  
in from_revision_ids
     merger.set_other_revision(other, other_branch)
   File "/Library/Python/2.5/site-packages/bzrlib/merge.py", line 345,  
in set_other_revision
     self._maybe_fetch(other_branch, self.this_branch,  
self.other_rev_id)
   File "/Library/Python/2.5/site-packages/bzrlib/merge.py", line 362,  
in _maybe_fetch
     target.fetch(source, revision_id)
   File "/Library/Python/2.5/site-packages/bzrlib/decorators.py", line  
192, in write_locked
     result = unbound(self, *args, **kwargs)
   File "/Library/Python/2.5/site-packages/bzrlib/branch.py", line  
495, in fetch
     pb=nested_pb)
   File "/Library/Python/2.5/site-packages/bzrlib/repository.py", line  
1133, in fetch
     find_ghosts=find_ghosts, fetch_spec=fetch_spec)
   File "/Library/Python/2.5/site-packages/bzrlib/repository.py", line  
2640, in fetch
     pb=pb, find_ghosts=find_ghosts)
   File "/Library/Python/2.5/site-packages/bzrlib/fetch.py", line 103,  
in __init__
     self.__fetch()
   File "/Library/Python/2.5/site-packages/bzrlib/fetch.py", line 130,  
in __fetch
     self._fetch_everything_for_search(search, pp)
   File "/Library/Python/2.5/site-packages/bzrlib/fetch.py", line 156,  
in _fetch_everything_for_search
     stream, from_format, [])
   File "/Library/Python/2.5/site-packages/bzrlib/repository.py", line  
3618, in insert_stream
     return self._locked_insert_stream(stream, src_format)
   File "/Library/Python/2.5/site-packages/bzrlib/repository.py", line  
3628, in _locked_insert_stream
     for substream_type, substream in stream:
   File "/Library/Python/2.5/site-packages/bzrlib/repository.py", line  
3783, in get_stream
     for _ in self._generate_root_texts(revs):
   File "/Library/Python/2.5/site-packages/bzrlib/repository.py", line  
3752, in _generate_root_texts
     self.from_repository).generate_root_texts(revs)
   File "/Library/Python/2.5/site-packages/bzrlib/fetch.py", line 258,  
in generate_root_texts
     revs, parent_map, graph)
   File "/Library/Python/2.5/site-packages/bzrlib/fetch.py", line 232,  
in _find_root_ids
     for tree in self.iter_rev_trees(revs):
   File "/Library/Python/2.5/site-packages/bzrlib/fetch.py", line 223,  
in iter_rev_trees
     for tree in self.source.revision_trees(revs[:100]):
   File "/Library/Python/2.5/site-packages/bzrlib/repository.py", line  
1865, in revision_trees
     for inv in inventories:
   File "/Library/Python/2.5/site-packages/bzrlib/repository.py", line  
1730, in _iter_inventories
     yield self.deserialise_inventory(revision_id, text)
   File "/Library/Python/2.5/site-packages/bzrlib/repository.py", line  
1752, in deserialise_inventory
     entry_cache=self._inventory_entry_cache)
   File "/Library/Python/2.5/site-packages/bzrlib/xml_serializer.py",  
line 82, in read_inventory_from_string
     raise errors.UnexpectedInventoryFormat(e)
UnexpectedInventoryFormat: not well-formed (invalid token): line 16,  
column 56

4030.354  return code 3


-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 2193 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20090320/89f7ff63/attachment.bin