Rolling back

[Paul R]

Calvin> There was a tip in the main repo, and I had a clone. I made
Calvin> some changes to the local, committed, and I pulled the tip
Calvin> from the server. I merged it with local, updated, committed
Calvin> again and pushed to the main repo. However, later on I found
Calvin> out that I accidentally removed some important files when
Calvin> "merging, updating" period. I tried to use "hg revert", "hg
Calvin> rollback" but nothing worked (I reckon I used incorrectly) my
Calvin> local repo is messed up - have some missing files.
Calvin> 
Calvin> Is there any way to rollback to a moment before
Calvin> merging/updating process?

Jorge> so both your local and remote repo are missing the files? then
Jorge> you only option is to eliminate those revs. here is an
Jorge> explanation on how to clone/export to eliminate the offending
Jorge> changesets.

If calvin only wants his files back, that's a pretty bad solution IMO.
Calvin, Jorge, when you say "repo", don't you mean "checkout copy" ?
Calvin, if you checked in your "missing files" at some point, they are
still in the repository, although they are missing in your checkout
copy of the tip (if you 'hg remove'ed them later). To get them back,
just update to a revision when they still existed in the working copy,
and they will reappear.

    hg help update


-- 
  Paul