how to *really* revert?
Mark Williamson
mark.williamson at cl.cam.ac.uk
Tue Aug 9 10:30:01 CDT 2005
> > Does hg status give any interesting information? Have you committed
> > anything to your repository?
>
> yeh, hg status returns:
>
> dargo:~/xen-unstable.hg> hg status
> M linux-2.6-xen-sparse/arch/xen/kernel/reboot.c
> M tools/python/xen/lowlevel/xs/xs.c
> M tools/python/xen/xm/main.py
> M xen/arch/x86/mm.c
> M xen/include/asm-x86/page.h
Just a thought: from my memory, the changes detection code compares timestamps
before it compares file contents. Perhaps if you've touched those files at
some point, they've got the wrong timestamps and that's throwing this out?
This really needs an hg developer to confirm or deny...
Cheers,
Mark
> So, the question is, will this merge then reverse some merge changes in the
> past, or is it going to unsync all those files?
>
> I have to say, I spent 4 hours merging badly yesterday to the point in
> which I had to throw away 3 trees. Granted, merging is never fun, but I've
> never quite had those problems before.
>
> -Sean
More information about the Mercurial
mailing list