Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-add @ 5467:521284cdbcb4
mercurial.el: mark-marker() returns non-nil with no active mark on GNU Emacs
author | NIIMI Satoshi <sa2c@sa2c.net> |
---|---|
date | Thu, 11 Oct 2007 06:10:45 +0900 |
parents | 212de429e000 |
children |
line wrap: on
line source
#!/bin/sh hg init a cd a echo a > a hg add -n hg st hg add hg st echo b > b hg add -n b hg st hg add b hg st echo % should fail hg add b hg st hg ci -m 0 echo % should fail hg add a echo aa > a hg ci -m 1 hg up 0 echo aaa > a hg ci -m 2 hg merge hg st echo % should fail hg add a hg st hg ci -m merge echo % issue683 hg rm a hg st echo a > a hg add a hg st