Mercurial > hg > pyhgsh

changeset 748:c5df1a9c5276

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update test output for status change manifest hash: da9effa63afe6ec22389e17f7fc2daeb3bb4f0e0
author mpm@selenic.com
date Thu, 21 Jul 2005 12:40:28 -0500
parents c3ce3976ae75
children 7e4843b7efd2
files tests/test-conflict.out tests/test-tags.out tests/test-up-local-change.out
diffstat 3 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-conflict.out	Thu Jul 21 12:29:19 2005 -0500
+++ b/tests/test-conflict.out	Thu Jul 21 12:40:28 2005 -0500
@@ -20,5 +20,5 @@
 =======
 something
 + hg status
-C a
+M a
 ? .out
--- a/tests/test-tags.out	Thu Jul 21 12:29:19 2005 -0500
+++ b/tests/test-tags.out	Thu Jul 21 12:40:28 2005 -0500
@@ -24,7 +24,7 @@
 b9154636be93 tip
 + echo bb
 + hg status
-C a
+M a
 + hg identify
 b9154636be93+ tip
 + hg co first
@@ -33,7 +33,7 @@
 + hg -v id
 acb14030fe0a21b60322c440ad2d20cf7685a376+ first
 + hg status
-C a
+M a
 + echo 1
 + hg add b
 + hg commit -t branch -u test -d '0 0'
@@ -43,5 +43,5 @@
 + hg id
 c8edf04160c7+b9154636be93+ tip
 + hg status
-C .hgtags
-C a
+M .hgtags
+M a
--- a/tests/test-up-local-change.out	Thu Jul 21 12:29:19 2005 -0500
+++ b/tests/test-up-local-change.out	Thu Jul 21 12:40:28 2005 -0500
@@ -24,7 +24,7 @@
 + cd ../r2
 + hg -q pull ../r1
 + hg status
-C a
+M a
 + hg --debug up
 resolving manifests
  force None allow None moddirstate True linear True