[Monotone-devel] Re: unexpected behavior from "merge_into_dir" + "propagate"

[Lapo Luchini]

Lapo Luchini wrote:
> PS: "mtn pluck" on the new main-revision did the correct thing... even
> tough I don't like "pluck" very much, as it leaves no DAG-evidence of
> what was done...

...and not even the "perfectly correct" thing after all, as the very 
fact of leaving no evidence lead to a "rename target conflict": the 
view.php file created in the "main" branch, and the one created in the 
"sub" branch by plucking "main" are not the *same* file.

    Lapo