Difficulty of reconstructing a branch whilst deleting/fixing a broken revision

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Jules Bean wrote:
> So this part sounds like a real bug, then. And possibly an important
> one. I still have the broken repo, and the fixed one, and most
> intermediate states too. I can't share the whole thing publically
> (sorry!) but is there something I can do to help pin this down?

A list of the commands you ran after the previous commit leading up to
this unshelve error would be helpful.

>> Perhaps a "merge --no-history" option would serve better.  It would be
>> an explicit way to apply changes without preserving history, and would
>> work with our existing formats.
> 
> That would be no different from a merge followed by a forget-merges,
> would it?

My idea was that it would be different: it would not copy the history at
all, unlike forget-merges, which copies it but leaves it easy to get rid of.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAktyIzYACgkQ0F+nu1YWqI1VaACeIiEYOWzUtmJrZf7j+oaGKM8j
rJwAni+XbJzpNSRJzHjkPzVV4R5fxhD+
=7aO7
-----END PGP SIGNATURE-----