Mercurial > hgrepos > DevTools > mercurial-extensions
changeset 268:bdb0cbc4c515
FIX: Create test2.txt always with a fixed defined modification time
| author | Franz Glasner <hg@dom66.de> |
|---|---|
| date | Fri, 04 Jan 2019 16:58:46 +0100 |
| parents | c7f70d06b6b1 |
| children | 1e375da37f2e |
| files | tests/lib-test-timestamps.sh |
| diffstat | 1 files changed, 2 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/lib-test-timestamps.sh Fri Jan 04 16:57:23 2019 +0100 +++ b/tests/lib-test-timestamps.sh Fri Jan 04 16:58:46 2019 +0100 @@ -91,6 +91,7 @@ cat >>files/test2.txt <<EOF 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)' # @@ -100,5 +101,6 @@ cat >>files/test2.txt <<EOF 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)' }
