Mercurial > hg-allpaths

changeset 65:030b8a638ccf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
History note
author Marcin Kasperski <Marcin.Kasperski@mekk.waw.pl>
date Sun, 18 Dec 2016 21:16:04 +0100
parents bbd1a915b34c
children 91efe98be062
files HISTORY.txt tests/basic.t tests/groups-legacy.t tests/groups-modern.t
diffstat 4 files changed, 21 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/HISTORY.txt	Sun Dec 18 21:12:56 2016 +0100
+++ b/HISTORY.txt	Sun Dec 18 21:16:04 2016 +0100
@@ -1,3 +1,8 @@
+1.0.2
+~~~~~~~~~~~~~
+
+Some unimportant test tweaks (tests were failing in some environments).
+
 1.0.1
 ~~~~~~~~~~~~~
 
--- a/tests/basic.t	Sun Dec 18 21:12:56 2016 +0100
+++ b/tests/basic.t	Sun Dec 18 21:16:04 2016 +0100
@@ -220,8 +220,17 @@
   adding br1.txt
   $ hg --cwd $BASE commit -m 'Br1'
 
-  $ hg --cwd $BASE update default
+Slightly tweaky way to update is to defeat mercurial 4.0 warning
+spuriously showing up during automated tests. It used to be
+$ hg --cwd $BASE update default
+1 files updated, 0 files merged, 1 files removed, 0 files unresolved
+
+  $ cd $BASE
+  $ pwd
+  /tmp/cramtests-*/basic.t/work/base (glob)
+  $ hg update default    # --cwd $BASE
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
+
   $ cat >> $BASE/file.txt << EOF
   > later text
   > EOF
--- a/tests/groups-legacy.t	Sun Dec 18 21:12:56 2016 +0100
+++ b/tests/groups-legacy.t	Sun Dec 18 21:16:04 2016 +0100
@@ -276,7 +276,9 @@
   $ hg --cwd $BASE commit -m 'Br1'
 
   $ cd $BASE
-  $ hg --cwd $BASE update default
+  $ pwd
+  /tmp/cramtests-*/groups-legacy.t/work/base (glob)
+  $ hg update default    # --cwd $BASE
   2 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ cat >> $BASE/file.txt << EOF
   > later text
--- a/tests/groups-modern.t	Sun Dec 18 21:12:56 2016 +0100
+++ b/tests/groups-modern.t	Sun Dec 18 21:16:04 2016 +0100
@@ -298,7 +298,9 @@
   $ hg --cwd $BASE commit -m 'Br1'
 
   $ cd $BASE
-  $ hg --cwd $BASE update default
+  $ pwd
+  /tmp/cramtests-*/groups-modern.t/work/base (glob)
+  $ hg update default    # --cwd $BASE
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ cat >> $BASE/file.txt << EOF
   > later text