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

[John Arbash Meinel]

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


...

> For merges with non-broken branches I had to preserve the merge. Worse
> still these merges conflicted, one of them very badly, and I had to
> preserve the conflict resolution. In the end I did the merge (with the
> exact revid of the parent in the non-broken branch), resolved any file
> name conflicts by hand, using bzr inventory --show-ids when in doubt
> to see how the conflicts had been resolved in the other branch, and
> then synced up the working tree of the reconstructed branch with a
> working tree of a broken branch (at the corresponding revision) using
> rsync like this:

Just to comment on this specific issue. You should probably have been
able to do:

 bzr revert -r revid:$ORIGINAL_REVID .

And have it set the content of the current working tree to be identical
to the result of the original merge. The other method being something like:

 bzr revert -r $REVNO:../old_branch .

(The key is just to give the revision that you want the tree to look like.)

I think the '.' is significant, as it tells us to not forget the merge
parents. (Open bug that we should have a more obvious flag for that as
well.)

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAktxlf0ACgkQJdeBCYSNAANyggCfURyNU4w1DIV4hy1WaMX5C7m1
UnsAoMaGjWWRzW8PanusWA1284fWXsTI
=4cZi
-----END PGP SIGNATURE-----