[issue1119] status with specific rev after merge failing

Michael Morgan mercurial-bugs at selenic.com
Wed May 14 10:21:34 CDT 2008


New submission from Michael Morgan <mikmorg at mdmsolutions.org>:

Try this...

hg branch b
touch b
hg ci -A -m 'added b'
hg co -C default
hg merge b
hg st --rev default

The results of this is 'M b'. I would expect 'A b', since in respect to the
default branch, we are ADDING 'b', not modifying it.

----------
messages: 6030
nosy: mikmorg
priority: bug
status: chatting
title: status with specific rev after merge failing

____________________________________________________
Mercurial issue tracker <mercurial-bugs at selenic.com>
<http://www.selenic.com/mercurial/bts/issue1119>
____________________________________________________



More information about the Mercurial-devel mailing list