##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

hgweb: move another utility function into the webutil module
hgweb: move another utility function into the webutil module
Mads Kiilerich - - Load All Authors

File last commit:

r7177:09ed32b7 default
r7311:de9c87fe default
Show More
test-mq-qrefresh.out
255 lines | 3.5 KiB | text/plain | TextLexer
/ tests / test-mq-qrefresh.out
History | Source | Raw |Copy content |Copy permalink
Giorgos Keramidas
tests: add new test; test-mq-qrefresh
 r3136 % init
% commit
adding 1/base
adding 2/base
% qnew mqbase
% qrefresh
% qdiff
diff -r b55ecdccb5cf 1/base
--- a/1/base
+++ b/1/base
Matt Mackall
diff: don't show function name by default...
 r5863 @@ -1,1 +1,1 @@
Giorgos Keramidas
tests: add new test; test-mq-qrefresh
 r3136 -base
+patched
diff -r b55ecdccb5cf 2/base
--- a/2/base
+++ b/2/base
Matt Mackall
diff: don't show function name by default...
 r5863 @@ -1,1 +1,1 @@
Giorgos Keramidas
tests: add new test; test-mq-qrefresh
 r3136 -base
+patched
% qdiff dirname
diff -r b55ecdccb5cf 1/base
--- a/1/base
+++ b/1/base
Matt Mackall
diff: don't show function name by default...
 r5863 @@ -1,1 +1,1 @@
Giorgos Keramidas
tests: add new test; test-mq-qrefresh
 r3136 -base
+patched
diff -r b55ecdccb5cf 2/base
--- a/2/base
+++ b/2/base
Matt Mackall
diff: don't show function name by default...
 r5863 @@ -1,1 +1,1 @@
Giorgos Keramidas
tests: add new test; test-mq-qrefresh
 r3136 -base
+patched
% patch file contents
mqbase
diff -r b55ecdccb5cf 1/base
--- a/1/base
+++ b/1/base
Matt Mackall
diff: don't show function name by default...
 r5863 @@ -1,1 +1,1 @@
Giorgos Keramidas
tests: add new test; test-mq-qrefresh
 r3136 -base
+patched
diff -r b55ecdccb5cf 2/base
--- a/2/base
+++ b/2/base
Matt Mackall
diff: don't show function name by default...
 r5863 @@ -1,1 +1,1 @@
Giorgos Keramidas
tests: add new test; test-mq-qrefresh
 r3136 -base
+patched
% qrefresh 1
% qdiff
diff -r b55ecdccb5cf 1/base
--- a/1/base
+++ b/1/base
Matt Mackall
diff: don't show function name by default...
 r5863 @@ -1,1 +1,1 @@
Giorgos Keramidas
tests: add new test; test-mq-qrefresh
 r3136 -base
+patched
diff -r b55ecdccb5cf 2/base
--- a/2/base
+++ b/2/base
Matt Mackall
diff: don't show function name by default...
 r5863 @@ -1,1 +1,1 @@
Giorgos Keramidas
tests: add new test; test-mq-qrefresh
 r3136 -base
+patched
% qdiff dirname
diff -r b55ecdccb5cf 1/base
--- a/1/base
+++ b/1/base
Matt Mackall
diff: don't show function name by default...
 r5863 @@ -1,1 +1,1 @@
Giorgos Keramidas
tests: add new test; test-mq-qrefresh
 r3136 -base
+patched
diff -r b55ecdccb5cf 2/base
--- a/2/base
+++ b/2/base
Matt Mackall
diff: don't show function name by default...
 r5863 @@ -1,1 +1,1 @@
Giorgos Keramidas
tests: add new test; test-mq-qrefresh
 r3136 -base
+patched
% patch file contents
mqbase
diff -r b55ecdccb5cf 1/base
--- a/1/base
+++ b/1/base
Matt Mackall
diff: don't show function name by default...
 r5863 @@ -1,1 +1,1 @@
Giorgos Keramidas
tests: add new test; test-mq-qrefresh
 r3136 -base
+patched
% qrefresh . in subdir
% qdiff
diff -r b55ecdccb5cf 1/base
--- a/1/base
+++ b/1/base
Matt Mackall
diff: don't show function name by default...
 r5863 @@ -1,1 +1,1 @@
Giorgos Keramidas
tests: add new test; test-mq-qrefresh
 r3136 -base
+patched
diff -r b55ecdccb5cf 2/base
--- a/2/base
+++ b/2/base
Matt Mackall
diff: don't show function name by default...
 r5863 @@ -1,1 +1,1 @@
Giorgos Keramidas
tests: add new test; test-mq-qrefresh
 r3136 -base
+patched
% qdiff dirname
diff -r b55ecdccb5cf 1/base
--- a/1/base
+++ b/1/base
Matt Mackall
diff: don't show function name by default...
 r5863 @@ -1,1 +1,1 @@
Giorgos Keramidas
tests: add new test; test-mq-qrefresh
 r3136 -base
+patched
diff -r b55ecdccb5cf 2/base
--- a/2/base
+++ b/2/base
Matt Mackall
diff: don't show function name by default...
 r5863 @@ -1,1 +1,1 @@
Giorgos Keramidas
tests: add new test; test-mq-qrefresh
 r3136 -base
+patched
% patch file contents
mqbase
diff -r b55ecdccb5cf 1/base
--- a/1/base
+++ b/1/base
Matt Mackall
diff: don't show function name by default...
 r5863 @@ -1,1 +1,1 @@
Giorgos Keramidas
tests: add new test; test-mq-qrefresh
 r3136 -base
+patched
% qrefresh in hg-root again
% qdiff
diff -r b55ecdccb5cf 1/base
--- a/1/base
+++ b/1/base
Matt Mackall
diff: don't show function name by default...
 r5863 @@ -1,1 +1,1 @@
Giorgos Keramidas
tests: add new test; test-mq-qrefresh
 r3136 -base
+patched
diff -r b55ecdccb5cf 2/base
--- a/2/base
+++ b/2/base
Matt Mackall
diff: don't show function name by default...
 r5863 @@ -1,1 +1,1 @@
Giorgos Keramidas
tests: add new test; test-mq-qrefresh
 r3136 -base
+patched
% qdiff dirname
diff -r b55ecdccb5cf 1/base
--- a/1/base
+++ b/1/base
Matt Mackall
diff: don't show function name by default...
 r5863 @@ -1,1 +1,1 @@
Giorgos Keramidas
tests: add new test; test-mq-qrefresh
 r3136 -base
+patched
diff -r b55ecdccb5cf 2/base
--- a/2/base
+++ b/2/base
Matt Mackall
diff: don't show function name by default...
 r5863 @@ -1,1 +1,1 @@
Giorgos Keramidas
tests: add new test; test-mq-qrefresh
 r3136 -base
+patched
% patch file contents
mqbase
diff -r b55ecdccb5cf 1/base
--- a/1/base
+++ b/1/base
Matt Mackall
diff: don't show function name by default...
 r5863 @@ -1,1 +1,1 @@
Giorgos Keramidas
tests: add new test; test-mq-qrefresh
 r3136 -base
+patched
diff -r b55ecdccb5cf 2/base
--- a/2/base
+++ b/2/base
Matt Mackall
diff: don't show function name by default...
 r5863 @@ -1,1 +1,1 @@
Giorgos Keramidas
tests: add new test; test-mq-qrefresh
 r3136 -base
+patched
Mads Kiilerich
mq: Fix --qrefresh --short to work with --exclude and --include...
 r7177
% qrefresh --short tests:
% - add 1/base and 2/base one by one
% -- qdiff output
Mads Kiilerich
mq: Allow qrefresh --silent to take parameters...
 r7113 diff -r b55ecdccb5cf 1/base
--- a/1/base
+++ b/1/base
@@ -1,1 +1,1 @@
-base
+patched
diff -r b55ecdccb5cf 2/base
--- a/2/base
+++ b/2/base
@@ -1,1 +1,1 @@
-base
+patched
diff -r b55ecdccb5cf orphanchild
--- /dev/null
+++ b/orphanchild
@@ -0,0 +1,1 @@
+orphan
Mads Kiilerich
mq: Fix --qrefresh --short to work with --exclude and --include...
 r7177 % -- patch file content
Mads Kiilerich
mq: Allow qrefresh --silent to take parameters...
 r7113 mqbase
diff -r b55ecdccb5cf 1/base
--- a/1/base
+++ b/1/base
@@ -1,1 +1,1 @@
-base
+patched
diff -r b55ecdccb5cf 2/base
--- a/2/base
+++ b/2/base
@@ -1,1 +1,1 @@
-base
+patched
A orphanchild
? base
Mads Kiilerich
mq: Fix --qrefresh --short to work with --exclude and --include...
 r7177 % -- diff shows what is not in patch
Mads Kiilerich
mq: Allow qrefresh --silent to take parameters...
 r7113 diff
--- /dev/null
+++ b/orphanchild
@@ -0,0 +1,1 @@
+orphan
Mads Kiilerich
mq: Fix --qrefresh --short to work with --exclude and --include...
 r7177 % - before starting exclusive tests
1/base
2/base
% - exclude 2/base
1/base
% -- status shows 2/base as dirty
M 2/base
A orphanchild
? base
% - remove 1/base and add 2/base again but not orphanchild
2/base
% - add 1/base with include filter - and thus remove 2/base from patch
1/base
Patrick Mezard
mq: fix qrefresh losing copy information (issue 1134)
 r6801 % create test repo
adding a
% capture changes
diff --git a/a b/ab
copy from a
copy to ab
--- a/a
+++ b/ab
@@ -1,1 +1,2 @@
a
+b
diff --git a/a b/ac
copy from a
copy to ac
--- a/a
+++ b/ac
@@ -1,1 +1,2 @@
a
+c
% refresh and check changes again
diff --git a/a b/ab
copy from a
copy to ab
--- a/a
+++ b/ab
@@ -1,1 +1,2 @@
a
+b
diff --git a/a b/ac
copy from a
copy to ac
--- a/a
+++ b/ac
@@ -1,1 +1,2 @@
a
+c