Mercurial > hg
changeset 13159:3172da69ff37
tests: eliminate fast-forward merge in test-tag
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Thu, 16 Dec 2010 14:50:27 -0600 |
| parents | 9e7e24052745 |
| children | 07d08c130892 |
| files | tests/test-tag.t |
| diffstat | 1 files changed, 8 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-tag.t Tue Dec 07 03:29:21 2010 +0100 +++ b/tests/test-tag.t Thu Dec 16 14:50:27 2010 -0600 @@ -252,27 +252,29 @@ $ echo c1 > f1 $ hg ci -Am0 adding f1 + $ echo c2 > f2 + $ hg ci -Am1 + adding f2 + $ hg co -q 0 $ hg branch b1 marked working directory as branch b1 - $ echo c2 >> f1 - $ hg ci -m1 + $ hg ci -m2 $ hg up default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg merge b1 - 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + 0 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) $ hg tag t1 abort: uncommitted merge [255] $ hg status - M f1 $ hg tag --rev 1 t2 abort: uncommitted merge [255] $ hg tag --rev 1 --local t3 $ hg tags -v - tip 1:9466ada9ee90 - t3 1:9466ada9ee90 local + tip 2:8a8f787d0d5c + t3 1:c3adabd1a5f4 local $ cd ..