how to *really* revert?

Sean Dague sean at dague.net
Tue Aug 9 10:25:18 CDT 2005


On Tue, Aug 09, 2005 at 03:34:21PM +0100, Mark Williamson wrote:
> > I want to sync a tree completely with upstream to resync some changes.  I'm
> > confused as to how I do this without just a new clone (which takes 30
> > minutes).
> 
> Side note, if you use the seed tarball on the Xen downloads page, you can 
> speed this up quite a bit.  I usually just maintain a pristine "incoming" 
> tree and then clone that locally (which uses hardlinking, so it's fast and 
> space efficient).

That's a nifty trick (pristine local clone), I'll start doing that now.

> > dargo:~/xen-unstable.hg> hg pull
> > pulling from http://xenbits.xensource.com/xen-unstable.hg
> > searching for changes
> > no changes found
> > dargo:~/xen-unstable.hg> hg diff
> > dargo:~/xen-unstable.hg> hg update
> > aborting: outstanding uncommitted merges
> > dargo:~/xen-unstable.hg> hg revert
> > dargo:~/xen-unstable.hg> hg update
> > aborting: outstanding uncommitted merges
> >
> > If I do an hg commit, there are in fact 4 files that it wants to commit.
> > Why aren't they showing up in hg diff or why isn't hg revert getting rid of
> > those?
> 
> 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

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

-- 
__________________________________________________________________

Sean Dague                                       Mid-Hudson Valley
sean at dague dot net                            Linux Users Group
http://dague.net                                 http://mhvlug.org

There is no silver bullet.  Plus, werewolves make better neighbors
than zombies, and they tend to keep the vampire population down.
__________________________________________________________________
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://www.selenic.com/pipermail/mercurial/attachments/20050809/a4cdf644/attachment.pgp


More information about the Mercurial mailing list