How to get back to where I was?

[Benoit Boissinot]

On Sun, Mar 29, 2009 at 08:01:45PM -0500, skip at pobox.com wrote:
> I'm trying to incorporate another guy's changes into my repo.  He packed up
> a .hg file for me which I "pull"ed:
> 
>     % hg pull ~/tmp/lockfile.pidlockfile.r76.hg 
>     pulling from /Users/skip/tmp/lockfile.pidlockfile.r76.hg
>     searching for changes
>     adding changesets
>     adding manifests
>     adding file changes
>     added 8 changesets with 17 changes to 15 files (+1 heads)
>     (run 'hg heads' to see heads, 'hg merge' to merge)
> 
> [snip]
> 
> Now I'm left with his code.  My stuff is essentially all gone.  (He added a
> new file and apparently erased all my test code.)  How do I get back where I
> was before running the "hg pull" command?

Your data is still there, in the other head, see the output of `hg heads`
You can update to the other head with `hg update <other head nodeid>`.

The right thing would be to merge the changes (even if you just choose
to discard the changes.

regards,

Benoit

-- 
:wq