Repeated merge issue

[Thomas Arendsen Hein]

* Christian Boos <cboos at neuf.fr> [20051216 22:56]:
> Thomas Arendsen Hein wrote:
> >* Christian Boos <cboos at bct-technology.com> [20051215 12:24]:
> >>Example: In the stable repository, I'm currently at rev 72,
> >>I do a pull which brings in the new revisions 73, 74 and 75.
> >>I want to ignore 73 and 74, but apply 75 (a small bug fix).
> >>
> >>I would expect that doing the following would work:
> >>
> >> # First sync upto 74 and ignore the changes
> >> hg update -m 74
> >> hg revert
> >>    
> >
> >At this point you need "hg revert -r 72" as the update changed the
> >parent of the working directory.
> 
> Is this supposed to be different, and how, then?

Ok, my fault, you need to:
hg update -C 74 # not -m here
hg revert -r 72

> Not really... I spent some time to create a test script.
> I hope that this will demonstrate my problem better.

Yes, that helped me understand what we do differently, though it had
some problems with changes done in the same second without changing
the size, hg commit doesn't notice the changes then.

Attached is a script which demonstrates what you want.

Thomas

-- 
Email: thomas at intevation.de
http://intevation.de/~thomas/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: backport-from-trunk.sh
Type: application/x-sh
Size: 1196 bytes
Desc: not available
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20051217/72849d3a/attachment-0001.sh>