# HG changeset patch
# User Franz Glasner <hg@dom66.de>
# Date 1546637978 -3600
# Node ID 5b4acabe2c9eb1320f1bc2ce673af1e0f0ff27c8
# Parent  b4920c0ed54dfdb8fdb7d93eda27a88117e1ce6f
Use the canonical "hg commit" instead of "hg ci"

diff -r b4920c0ed54d -r 5b4acabe2c9e tests/lib-test-timestamps.sh
--- a/tests/lib-test-timestamps.sh	Fri Jan 04 22:38:37 2019 +0100
+++ b/tests/lib-test-timestamps.sh	Fri Jan 04 22:39:38 2019 +0100
@@ -51,7 +51,7 @@
 timestamps=$LOCAL_TESTDIR/../extensions/timestamps.py
 EOF
     hg add .hgtimestamps
-    hg ci -m 'Activate timestamps'
+    hg commit -m 'Activate timestamps'
     if [ "$SHOW_OUTPUT" = "1" ]; then
 	echo "# Check that .hgtimestamps.db is created and included automatically"
 	hg manifest
@@ -64,7 +64,7 @@
     mkdir untracked-directory
     touch -d 2017-12-01T01:02:03Z untracked-directory/untracked.txt
     hg add untracked-directory/untracked.txt
-    hg ci -m 'Add a tracked and untracked file'
+    hg commit -m 'Add a tracked and untracked file'
     if [ "$SHOW_OUTPUT" = "1" ]; then
 	echo "# Check the content of .hgtimestamps.db"
 	cat .hgtimestamps.db
@@ -73,7 +73,7 @@
 CHANGED
 EOF
     touch -d 2017-12-01T02:03:04Z files/test1.txt
-    hg ci -m 'Changed the ts-tracked file'
+    hg commit -m 'Changed the ts-tracked file'
     if [ "$SHOW_OUTPUT" = "1" ]; then
 	echo "# Check the content of .hgtimestampb.db after changing"
 	cat .hgtimestamps.db
@@ -81,14 +81,14 @@
     cat >>untracked-directory/untracked.txt <<EOF
 CHANGED
 EOF
-    hg ci -m 'Changed the non-tracked file'
+    hg commit -m 'Changed the non-tracked file'
     if [ "$SHOW_OUTPUT" = "1" ]; then
 	echo "# Check the content of .hgtimestampb.db after changing a non-tracked file"
 	cat .hgtimestamps.db
     fi
     touch -d 2017-12-01T04:05:06Z files/test2.txt
     hg add files/test2.txt
-    hg ci -m 'Added a second ts tracked file'
+    hg commit -m 'Added a second ts tracked file'
     if [ "$SHOW_OUTPUT" = "1" ]; then
 	echo "# Check the content of .hgtimestamps.db after adding a new file"
 	cat .hgtimestamps.db
@@ -98,7 +98,7 @@
     fi
     touch -d 2017-12-01T05:06:07Z files/test3.txt
     hg add files/test3.txt
-    hg ci -m 'Added a third ts tracked file'
+    hg commit -m 'Added a third ts tracked file'
     if [ "$SHOW_OUTPUT" = "1" ]; then
 	echo "# Check the content of .hgtimestamps.db after adding a third file"
 	cat .hgtimestamps.db
@@ -112,9 +112,9 @@
     touch -d 2017-12-01T06:07:08Z files/test4-2.txt
     hg add files/test4-2.txt
     if [ "$SHOW_OUTPUT" = "1" ]; then
-	hg ci -m 'A new test file in a second line of code'
+	hg commit -m 'A new test file in a second line of code'
     else
-	hg ci --quiet -m 'A new test file in a second line of code'
+	hg commit --quiet -m 'A new test file in a second line of code'
     fi
     if [ "$SHOW_OUTPUT" = "1" ]; then
 	echo "# Check the content of .hgtimestamps.db after adding a file in 2nd line of code"
@@ -124,7 +124,7 @@
 CHANGED in the 2nd line of code
 EOF
     touch -d 2017-12-01T07:08:09Z files/test2.txt
-    hg ci -m 'Changed a file in the 2nd code line (file2)'
+    hg commit -m 'Changed a file in the 2nd code line (file2)'
     if [ "$SHOW_OUTPUT" = "1" ]; then
 	echo "# Check the current local revision id 7"
 	hg id -n
@@ -138,7 +138,7 @@
 This is a conflicting change in the first line of code when merging
 EOF
     touch -d 2017-12-01T08:09:10Z files/test2.txt
-    hg ci -m 'Conflicting change of the content of a file in the first line of code (file2.txt)'
+    hg commit -m 'Conflicting change of the content of a file in the first line of code (file2.txt)'
     if [ "$SHOW_OUTPUT" = "1" ]; then
 	echo "# Check the current local revision id 8"
 	hg id -n
diff -r b4920c0ed54d -r 5b4acabe2c9e tests/test-timestamps.t
--- a/tests/test-timestamps.t	Fri Jan 04 22:38:37 2019 +0100
+++ b/tests/test-timestamps.t	Fri Jan 04 22:39:38 2019 +0100
@@ -125,7 +125,7 @@
   $ touch -d 2018-01-01T10:11:12Z files/test1.txt
   $ echo "CHANGED 3 ..." >>files/test2.txt
   $ touch -d 2018-01-01T11:12:13Z files/test2.txt
-  $ hg ci -m 'Explicit ci of test1.txt' files/test1.txt
+  $ hg commit -m 'Explicit ci of test1.txt' files/test1.txt
   $ hg status
   M files/test2.txt
   $ cat .hgtimestamps.db