hg resolve help lies

[Matt Mackall]

On Mon, 2009-10-26 at 03:14 +0300, timeless wrote:
> Please feel free to change my commit message, I'm fairly annoyed.
> Although, I should count my blessings, it could be worse, the help
> could have been right....
> 
> Anyway, a test for this would be a good idea, but I'm not in a state
> to write it.
> 
> cd /tmp ; rm -rf hgr; mkdir hgr; cd hgr; hg init; touch 0; hg add 0;
> hg commit -m 0; hg cp 0 1; hg commit -m 1; hg up -r 0; echo a > 0; hg
> commit -m 2; hg up -r 0; echo b > 0 ; hg commit -m 3; hg merge 1; hg
> commit -m 4; hg up -r 1; hg merge 2; hg commit -m 5; hg merge 4; hg
> cat -r 4 0 > 0; hg cat -r 5 1 > 1; cat 0 1; hg resolve --mark --all;
> cat 0 1; hg commit -m done
> 
> This is the testcase. According to the current help, the commit should
> fail. But no one wants that behavior.

Queued, thanks.


-- 
http://selenic.com : development and support for Mercurial and Linux