Mercurial > hg-stable
changeset 3137:2c472ab42b08
Merge with crew
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Thu, 21 Sep 2006 16:15:39 -0500 |
| parents | b1db258e875c (current diff) f01efb4bc258 (diff) |
| children | cc856c4d91ca |
| files | |
| diffstat | 2 files changed, 245 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-mq-qrefresh Thu Sep 21 16:15:39 2006 -0500 @@ -0,0 +1,84 @@ +#!/bin/sh + +echo "[extensions]" >> $HGRCPATH +echo "mq=" >> $HGRCPATH + +echo % init +hg init a +cd a + +echo % commit +mkdir 1 2 +echo 'base' > 1/base +echo 'base' > 2/base +hg ci -Ambase -d '1 0' + +echo % qnew mqbase +hg qnew -mmqbase mqbase + +echo % qrefresh +echo 'patched' > 1/base +echo 'patched' > 2/base +hg qrefresh + +echo % qdiff +hg qdiff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ + -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" + +echo % qdiff dirname +hg qdiff . | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ + -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" + +echo % patch file contents +cat .hg/patches/mqbase | \ +sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ + -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" + +echo % qrefresh 1 +echo 'patched again' > base +hg qrefresh 1 + +echo % qdiff +hg qdiff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ + -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" + +echo % qdiff dirname +hg qdiff . | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ + -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" + +echo % patch file contents +cat .hg/patches/mqbase | \ +sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ + -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" + +echo % qrefresh . in subdir +( cd 1 ; hg qrefresh . ) + +echo % qdiff +hg qdiff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ + -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" + +echo % qdiff dirname +hg qdiff . | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ + -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" + +echo % patch file contents +cat .hg/patches/mqbase | \ +sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ + -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" + +echo % qrefresh in hg-root again +hg qrefresh + +echo % qdiff +hg qdiff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ + -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" + +echo % qdiff dirname +hg qdiff . | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ + -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" + +echo % patch file contents +cat .hg/patches/mqbase | \ +sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ + -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-mq-qrefresh.out Thu Sep 21 16:15:39 2006 -0500 @@ -0,0 +1,161 @@ +% init +% commit +adding 1/base +adding 2/base +% qnew mqbase +% qrefresh +% qdiff +diff -r b55ecdccb5cf 1/base +--- a/1/base ++++ b/1/base +@@ -1,1 +1,1 @@ base +-base ++patched +diff -r b55ecdccb5cf 2/base +--- a/2/base ++++ b/2/base +@@ -1,1 +1,1 @@ base +-base ++patched +% qdiff dirname +diff -r b55ecdccb5cf 1/base +--- a/1/base ++++ b/1/base +@@ -1,1 +1,1 @@ base +-base ++patched +diff -r b55ecdccb5cf 2/base +--- a/2/base ++++ b/2/base +@@ -1,1 +1,1 @@ base +-base ++patched +% patch file contents +mqbase + +diff -r b55ecdccb5cf 1/base +--- a/1/base ++++ b/1/base +@@ -1,1 +1,1 @@ base +-base ++patched +diff -r b55ecdccb5cf 2/base +--- a/2/base ++++ b/2/base +@@ -1,1 +1,1 @@ base +-base ++patched +% qrefresh 1 +% qdiff +diff -r b55ecdccb5cf 1/base +--- a/1/base ++++ b/1/base +@@ -1,1 +1,1 @@ base +-base ++patched +diff -r b55ecdccb5cf 2/base +--- a/2/base ++++ b/2/base +@@ -1,1 +1,1 @@ base +-base ++patched +% qdiff dirname +diff -r b55ecdccb5cf 1/base +--- a/1/base ++++ b/1/base +@@ -1,1 +1,1 @@ base +-base ++patched +diff -r b55ecdccb5cf 2/base +--- a/2/base ++++ b/2/base +@@ -1,1 +1,1 @@ base +-base ++patched +% patch file contents +mqbase + +diff -r b55ecdccb5cf 1/base +--- a/1/base ++++ b/1/base +@@ -1,1 +1,1 @@ base +-base ++patched +% qrefresh . in subdir +% qdiff +diff -r b55ecdccb5cf 1/base +--- a/1/base ++++ b/1/base +@@ -1,1 +1,1 @@ base +-base ++patched +diff -r b55ecdccb5cf 2/base +--- a/2/base ++++ b/2/base +@@ -1,1 +1,1 @@ base +-base ++patched +% qdiff dirname +diff -r b55ecdccb5cf 1/base +--- a/1/base ++++ b/1/base +@@ -1,1 +1,1 @@ base +-base ++patched +diff -r b55ecdccb5cf 2/base +--- a/2/base ++++ b/2/base +@@ -1,1 +1,1 @@ base +-base ++patched +% patch file contents +mqbase + +diff -r b55ecdccb5cf 1/base +--- a/1/base ++++ b/1/base +@@ -1,1 +1,1 @@ base +-base ++patched +% qrefresh in hg-root again +% qdiff +diff -r b55ecdccb5cf 1/base +--- a/1/base ++++ b/1/base +@@ -1,1 +1,1 @@ base +-base ++patched +diff -r b55ecdccb5cf 2/base +--- a/2/base ++++ b/2/base +@@ -1,1 +1,1 @@ base +-base ++patched +% qdiff dirname +diff -r b55ecdccb5cf 1/base +--- a/1/base ++++ b/1/base +@@ -1,1 +1,1 @@ base +-base ++patched +diff -r b55ecdccb5cf 2/base +--- a/2/base ++++ b/2/base +@@ -1,1 +1,1 @@ base +-base ++patched +% patch file contents +mqbase + +diff -r b55ecdccb5cf 1/base +--- a/1/base ++++ b/1/base +@@ -1,1 +1,1 @@ base +-base ++patched +diff -r b55ecdccb5cf 2/base +--- a/2/base ++++ b/2/base +@@ -1,1 +1,1 @@ base +-base ++patched