Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-mq-qdiff.out @ 3387:ba7c74081861

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: update dirstate correctly for non-branchmerge updates - we don't actually need the context in recordupdates - use -1 for filesize to force check on normal update - only record copy for branchmerges - forget moved files on update
author Matt Mackall <mpm@selenic.com>
date Fri, 13 Oct 2006 17:58:04 -0500
parents 8ca608c1eb02
children
line wrap: on
line source

% init
% commit
adding base
% qnew mqbase
% qrefresh
% qdiff
diff -r 67e992f2c4f3 base
--- a/base
+++ b/base
@@ -1,1 +1,1 @@ base
-base
+patched
% qdiff dirname
diff -r 67e992f2c4f3 base
--- a/base
+++ b/base
@@ -1,1 +1,1 @@ base
-base
+patched