Mercurial > hg-stable
changeset 11850:54dbf16b401f
tests: unify test-addremove
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Sat, 14 Aug 2010 02:12:01 +0200 |
parents | 95a931616ba5 |
children | db955418a6af |
files | tests/test-addremove tests/test-addremove.out tests/test-addremove.t |
diffstat | 3 files changed, 47 insertions(+), 49 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-addremove Sat Aug 14 02:11:18 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,27 +0,0 @@ -#!/bin/sh - -hg init rep -cd rep -mkdir dir -touch foo dir/bar -hg -v addremove -hg -v commit -m "add 1" -d "1000000 0" -cd dir/ -touch ../foo_2 bar_2 -hg -v addremove -hg -v commit -m "add 2" -d "1000000 0" - -cd .. -hg init sim -cd sim -echo a > a -echo a >> a -echo a >> a -echo c > c -hg commit -Ama -mv a b -rm c -echo d > d -hg addremove -n -s 50 # issue 1696 -hg addremove -s 50 -hg commit -mb
--- a/tests/test-addremove.out Sat Aug 14 02:11:18 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,22 +0,0 @@ -adding dir/bar -adding foo -dir/bar -foo -committed changeset 0:d44511117907 -adding dir/bar_2 -adding foo_2 -dir/bar_2 -foo_2 -committed changeset 1:a85812e0561a -adding a -adding c -removing a -adding b -removing c -adding d -recording removal of a as rename to b (100% similar) -removing a -adding b -removing c -adding d -recording removal of a as rename to b (100% similar)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-addremove.t Sat Aug 14 02:12:01 2010 +0200 @@ -0,0 +1,47 @@ + $ hg init rep + $ cd rep + $ mkdir dir + $ touch foo dir/bar + $ hg -v addremove + adding dir/bar + adding foo + $ hg -v commit -m "add 1" -d "1000000 0" + dir/bar + foo + committed changeset 0:d44511117907 + $ cd dir/ + $ touch ../foo_2 bar_2 + $ hg -v addremove + adding dir/bar_2 + adding foo_2 + $ hg -v commit -m "add 2" -d "1000000 0" + dir/bar_2 + foo_2 + committed changeset 1:a85812e0561a + + $ cd .. + $ hg init sim + $ cd sim + $ echo a > a + $ echo a >> a + $ echo a >> a + $ echo c > c + $ hg commit -Ama + adding a + adding c + $ mv a b + $ rm c + $ echo d > d + $ hg addremove -n -s 50 # issue 1696 + removing a + adding b + removing c + adding d + recording removal of a as rename to b (100% similar) + $ hg addremove -s 50 + removing a + adding b + removing c + adding d + recording removal of a as rename to b (100% similar) + $ hg commit -mb