# HG changeset patch
# User Franz Glasner <hg@dom66.de>
# Date 1548785849 -3600
# Node ID 4e86a3bce096fbff4e11aefa71ac49d711f70feb
# Parent  15d23729d176a98337d05897a300761d85cabf68
FIX: Tests: subrepo setup had trailing whitespace ad HEREDOC-end:
     this made the complete kgwarchive subrepo configuration invalid.

All ids have changed.

diff -r 15d23729d176 -r 4e86a3bce096 tests/lib-test-kwarchive.sh
--- a/tests/lib-test-kwarchive.sh	Tue Jan 29 18:07:43 2019 +0100
+++ b/tests/lib-test-kwarchive.sh	Tue Jan 29 19:17:29 2019 +0100
@@ -135,9 +135,9 @@
 EOF
     cp src/f2.py src/f2.txt
     hg add VERSION README test2.txt test2-not-expanded.txt
-    hg ci -m 'First part of files: VERSION, README, test2.txt'
+    hg commit -m 'First part of files: VERSION, README, test2.txt'
     hg add --quiet src/
-    hg ci -m 'All files in src'
+    hg commit -m 'All files in src'
 
     cd ..
 }
@@ -177,7 +177,7 @@
 MyFullRevision = HGrevision
 
 MySubstKeyword = replace:: This is a custom replacement
-EOF    
+EOF
     cat >f1.txt <<EOF
 f1.txt: Some file content
 EOF
@@ -239,15 +239,15 @@
 
 EOF
     cp src/f2.py src/f2.txt
-    hg add VERSION README test2.txt test2-not-expanded.txt
+    hg add VERSION README f1.txt test2.txt test2-not-expanded.txt
     hg commit -m '2: First part of files: VERSION, README, test2.txt'
     hg add --quiet src/
-    hg ci -m '3: All files in src'
+    hg commit -m '3: All files in src'
     # should have no output
-    hg st
+    hg status
     if [ ! -z "$2" ]; then
 	cd ..
-    fi    
+    fi
     cd ..
     # and really add/activate the subrepo in the parent
     if [ ! -z "$2" ]; then
diff -r 15d23729d176 -r 4e86a3bce096 tests/test-kwarchive.t
--- a/tests/test-kwarchive.t	Tue Jan 29 18:07:43 2019 +0100
+++ b/tests/test-kwarchive.t	Tue Jan 29 19:17:29 2019 +0100
@@ -336,17 +336,17 @@
   $ echo `pwd`
   $TESTTMP/repo3
   $ cat .hgsubstate
-  dac015e51ef48ba739a3c318dfb602011e236328 subrepos1/subrepo1
+  0c95c26060e11bb02614a08140e64df4bf9f4db1 subrepos1/subrepo1
   $ cd subrepos1/subrepo1
   $ prepare_subrepo "subrepo2" "subrepos2"
   $ echo `pwd`
   $TESTTMP/repo3/subrepos1/subrepo1
   $ cat .hgsubstate
-  dac015e51ef48ba739a3c318dfb602011e236328 subrepos2/subrepo2
+  0c95c26060e11bb02614a08140e64df4bf9f4db1 subrepos2/subrepo2
   $ cd ../..
   $ hg ci -m 'Include the nested subrepo'
   $ cat .hgsubstate
-  178db3dd221b646aa0487b4051e267bda182159c subrepos1/subrepo1
+  d1b8815da083673940df64aa6e450308e6b493b0 subrepos1/subrepo1
 
   $ hg kwprint -S
   $Author: first.second $
@@ -354,20 +354,20 @@
   $HGbookmarks:  $
   $HGbranch: default $
   $HGpath: hg+https://hg/repo.hg $
-  $HGrevision: 3d458771fce381c52a332311cb8a66ea2cc55a1a $
+  $HGrevision: 5da89dae8d25aa4d9c6973c1269cca7d37822e6e $
   $HGshortdate: 1970-01-01 $
   $HGtags:  $
   $JustDate: 1970-01-01 $
-  $Revision: 3d458771fce3 $
+  $Revision: 5da89dae8d25 $
   $State: draft $
   ^$ (re)
   $File: test.file $
-  $HGheader: hg+https://hg/repo.hg/dir1/dir2/test.file 3d458771fce381c52a332311cb8a66ea2cc55a1a 1970-01-01 00:00:00 +0000 first.second draft $
-  $HGid: hg+https://hg/repo.hg/dir1/dir2/test.file 3d458771fce3 1970-01-01 00:00:00 +0000 first.second draft $
+  $HGheader: hg+https://hg/repo.hg/dir1/dir2/test.file 5da89dae8d25aa4d9c6973c1269cca7d37822e6e 1970-01-01 00:00:00 +0000 first.second draft $
+  $HGid: hg+https://hg/repo.hg/dir1/dir2/test.file 5da89dae8d25 1970-01-01 00:00:00 +0000 first.second draft $
   $HGnodeid: a4dd6f4b22e11fec41158eec187630c24a43120a $
   $HGsource: hg+https://hg/repo.hg/dir1/dir2/test.file $
-  $Header: dir1/dir2/test.file 3d458771fce3 1970-01-01 00:00:00 +0000 first.second draft $
-  $Id: test.file 3d458771fce3 1970-01-01 00:00:00 +0000 first.second draft $
+  $Header: dir1/dir2/test.file 5da89dae8d25 1970-01-01 00:00:00 +0000 first.second draft $
+  $Id: test.file 5da89dae8d25 1970-01-01 00:00:00 +0000 first.second draft $
   $Source: dir1/dir2/test.file $
   ^$ (re)
   ^$ (re)
@@ -376,20 +376,20 @@
   $HGbookmarks:  $
   $HGbranch: default $
   $HGpath: file:///subrepo1 $
-  $HGrevision: 178db3dd221b646aa0487b4051e267bda182159c $
+  $HGrevision: d1b8815da083673940df64aa6e450308e6b493b0 $
   $HGshortdate: 1970-01-01 $
   $HGtags:  $
   $JustDate: 1970-01-01 $
-  $Revision: 178db3dd221b $
+  $Revision: d1b8815da083 $
   $State: draft $
   ^$ (re)
   $File: test-s.file $
-  $HGheader: file:///subrepo1/dir3/dir4/test-s.file 178db3dd221b646aa0487b4051e267bda182159c 1970-01-01 00:00:00 +0000 first.second draft $
-  $HGid: file:///subrepo1/dir3/dir4/test-s.file 178db3dd221b 1970-01-01 00:00:00 +0000 first.second draft $
+  $HGheader: file:///subrepo1/dir3/dir4/test-s.file d1b8815da083673940df64aa6e450308e6b493b0 1970-01-01 00:00:00 +0000 first.second draft $
+  $HGid: file:///subrepo1/dir3/dir4/test-s.file d1b8815da083 1970-01-01 00:00:00 +0000 first.second draft $
   $HGnodeid: ffffffff22e11fec41158eec187630c24a43120a $
   $HGsource: file:///subrepo1/dir3/dir4/test-s.file $
-  $Header: dir3/dir4/test-s.file 178db3dd221b 1970-01-01 00:00:00 +0000 first.second draft $
-  $Id: test-s.file 178db3dd221b 1970-01-01 00:00:00 +0000 first.second draft $
+  $Header: dir3/dir4/test-s.file d1b8815da083 1970-01-01 00:00:00 +0000 first.second draft $
+  $Id: test-s.file d1b8815da083 1970-01-01 00:00:00 +0000 first.second draft $
   $Source: dir3/dir4/test-s.file $
   ^$ (re)
   ^$ (re)
@@ -398,18 +398,18 @@
   $HGbookmarks:  $
   $HGbranch: default $
   $HGpath: file:///subrepo2 $
-  $HGrevision: dac015e51ef48ba739a3c318dfb602011e236328 $
+  $HGrevision: 0c95c26060e11bb02614a08140e64df4bf9f4db1 $
   $HGshortdate: 1970-01-01 $
   $HGtags:  $
   $JustDate: 1970-01-01 $
-  $Revision: dac015e51ef4 $
+  $Revision: 0c95c26060e1 $
   $State: draft $
   ^$ (re)
   $File: test-s.file $
-  $HGheader: file:///subrepo2/dir3/dir4/test-s.file dac015e51ef48ba739a3c318dfb602011e236328 1970-01-01 00:00:00 +0000 first.second draft $
-  $HGid: file:///subrepo2/dir3/dir4/test-s.file dac015e51ef4 1970-01-01 00:00:00 +0000 first.second draft $
+  $HGheader: file:///subrepo2/dir3/dir4/test-s.file 0c95c26060e11bb02614a08140e64df4bf9f4db1 1970-01-01 00:00:00 +0000 first.second draft $
+  $HGid: file:///subrepo2/dir3/dir4/test-s.file 0c95c26060e1 1970-01-01 00:00:00 +0000 first.second draft $
   $HGnodeid: ffffffff22e11fec41158eec187630c24a43120a $
   $HGsource: file:///subrepo2/dir3/dir4/test-s.file $
-  $Header: dir3/dir4/test-s.file dac015e51ef4 1970-01-01 00:00:00 +0000 first.second draft $
-  $Id: test-s.file dac015e51ef4 1970-01-01 00:00:00 +0000 first.second draft $
+  $Header: dir3/dir4/test-s.file 0c95c26060e1 1970-01-01 00:00:00 +0000 first.second draft $
+  $Id: test-s.file 0c95c26060e1 1970-01-01 00:00:00 +0000 first.second draft $
   $Source: dir3/dir4/test-s.file $