A tale of user-friendliness with "hg merge" and "hg rollback".

[Abderrahim Kitouni]

Hi,

2009/10/13 Rob Landley <rob at landley.net>:
>
> Explicitly trying to be dumb is one thing.  This was a one-line commit to a
> file that didn't have any changes within a dozen lines of that commit, a case
> where exporting a diff and applying it as a patch would have worked just fine.
[...]
> And in future I know to go back to "hg export" and "hg import" rather than
> trying to pull.
[...]
> Most of the actual fiddling with branches I've done has been in git, and I
> thought both that mercurial had an equivalent of "fast forward" merging and
(I hope you agree this doesn't seem like a fast-forward, since your
friend's change was based on an old version)
> that the technique could handle more cases than it did.  Since "hg export/hg
> import" doesn't need to produce a merge commit, I didn't think this did
> either.  I was wrong.