Mercurial > hg
diff tests/test-up-local-change.out @ 808:8f5637f0a0c0
Merge with TAH
author | mpm@selenic.com |
---|---|
date | Sat, 30 Jul 2005 08:35:29 -0800 |
parents | 853bfbf1a312 1f9ec150a476 |
children | 0902ffece4b4 |
line wrap: on
line diff
--- a/tests/test-up-local-change.out Sat Jul 30 08:30:12 2005 -0800 +++ b/tests/test-up-local-change.out Sat Jul 30 08:35:29 2005 -0800 @@ -1,29 +1,19 @@ -+ mkdir r1 -+ cd r1 + hg init -+ echo a + hg addremove adding a -+ hg commit -m 1 -d '0 0' ++ hg commit -m 1 -d 0 0 + hg clone . ../r2 -+ cd ../r2 + hg up -+ echo abc + hg diff -+ sed 's/\(\(---\|+++\) [^ \t]*\)[ \t].*/\1/' diff -r c19d34741b0a a --- a/a +++ b/a @@ -1,1 +1,1 @@ -a +abc -+ cd ../r1 -+ echo b -+ echo a2 + hg addremove adding b -+ hg commit -m 2 -d '0 0' -+ cd ../r2 ++ hg commit -m 2 -d 0 0 + hg -q pull ../r1 + hg status M a @@ -67,7 +57,6 @@ + hg diff -+ sed 's/\(\(---\|+++\) [^ \t]*\)[ \t].*/\1/' diff -r 1e71731e6fbb a --- a/a +++ b/a