why does backout in this situation need to merge anything?

[Wujek Srujek]

I don't think that's the case:
1. I create the file with initial contents
2. edit file
3. edit file again
4. add new file and commit

So, when I backount 3, it is not the immediate parent of my working copy.
If it were, I would understand what is happening.

wujek


On Tue, Dec 11, 2012 at 10:08 PM, Kevin Bullock <
kbullock+mercurial at ringworld.org> wrote:

> On 11 Dec 2012, at 2:51 PM, Wujek Srujek wrote:
>
> > Believe me, I read the docs, but maybe I missed something.
> > Why doesn't the first backout require a merge, then?
>
> From `hg help backout`:
>
>    If REV is the parent of the working directory, then this new changeset
> is
>    committed automatically.
>
> In other words, you're just reversing the immediately prior change -- all
> hg has to do is effectively apply the diff in reverse (the same as `patch
> -R`).
>
> pacem in terris / мир / शान्ति / ‎‫سَلاَم‬ / 平和
> Kevin R. Bullock
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20121211/59b4b32c/attachment-0002.html>