"resuming" a changeset

[Jesse Glick]

Manlio Perillo wrote:
> Suppose I made same changes to a shared repository in changeset A.
> Now suppose that another person commits (after a pull) a new changeset
> B, removing my modifications.

Using, say, hg backout?

> What is the best method for resuming the changes I made in changeset A?

Back out the backout so your change is back in? :-)

hgtest-backout$ hg init
hgtest-backout$ echo 1 > f
hgtest-backout$ hg ci -A -m1
adding f
hgtest-backout$ echo 2 > f
hgtest-backout$ hg ci -m2
hgtest-backout$ cat f
2
hgtest-backout$ hg backout tip
reverting f
changeset 2:25ace1d37467 backs out changeset 1:10cf62379a6d
hgtest-backout$ cat f
1
hgtest-backout$ hg backout tip
reverting f
changeset 3:597e92e48aea backs out changeset 2:25ace1d37467
hgtest-backout$ cat f
2
hgtest-backout$