why does backout in this situation need to merge anything?

[Kevin Bullock]

On 11 Dec 2012, at 1:57 PM, Wujek Srujek wrote:

> ~/Playground/test$ hg backout -r 1
> reverting file
> merging file
> 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
> 
> Basically, it adds 3 changesets, cset 1 and 2 add some lines, and then they are backouted in reverste order. Why does backing out cset 1 require a merge?

From `hg help backout`:

    If REV is the parent of the working directory, then this new changeset is
    committed automatically. Otherwise, hg needs to merge the changes and the
    merged result is left uncommitted.

Note that when you commit this "merged" result, you will not be creating a "merge changeset" -- the resulting changeset will have only one parent. Note further that a simple `hg update` with uncommitted changes may also result in this same kind of merge (in the sense of "merging file contents", not in the sense of "creating a merge changeset").

pacem in terris / мир / शान्ति / ‎‫سَلاَم‬ / 平和
Kevin R. Bullock