Reverting automatic rebase

[Pierre-Yves David]

On Tue, Aug 21, 2012 at 02:30:46PM +0200, Michał Sznajder wrote:
> One of my fellow programmers executed hg pull --rebase. He had a
> conflict and he resolved it. During tests he figured out that conflict
> was incorrectly resolved. He would like to get his original revision.
> 
> I know that it is not possible, isn't it? But could you suggest
> something for the future? Some kind of hook that in case of auto rebase
> bundles all rebased revisions?  For manual rebase we can use --keep.

You should be able to find the bundled original revision in .hg/strip-backup

> Will Mutable Hg  help with this issue in any way?

Yes relying on obsolescence marker intead os stripped ensure an easy acces to your precursor version and simple diffing betwen those version.


-- 
Pierre-Yves David

http://www.logilab.fr/

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20120821/ddaf2b9b/attachment.asc>