Mercurial > hg
view tests/test-add @ 10191:99d285ac5da4
mq: qdiff with the same diff options than qrefresh (issue1350)
Specifically, if current patch is a git patch and mq.git=keep, diff in git
mode.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Fri, 01 Jan 2010 21:49:05 +0100 |
parents | e6162b854ed5 |
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 hg forget a hg add hg st echo b > b hg add -n b hg st hg add b || echo "failed to add b" hg st echo % should fail hg add b hg st hg ci -m 0 --traceback 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 resolve -m a hg ci -m merge echo % issue683 hg forget a hg add a hg st hg rm a hg st echo a > a hg add a hg st hg add c && echo "unexpected addition of missing file" echo c > c hg add d c && echo "unexpected addition of missing file" hg st