--- a/tests/test-subrepo.t Mon Oct 25 11:36:22 2021 +0200
+++ b/tests/test-subrepo.t Fri Nov 19 03:04:42 2021 +0100
@@ -1021,37 +1021,21 @@
test if untracked file is not overwritten
-(this also tests that updated .hgsubstate is treated as "modified",
-when 'merge.update()' is aborted before 'merge.recordupdates()', even
-if none of mode, size and timestamp of it isn't changed on the
-filesystem (see also issue4583))
+(this tests also has a change to update .hgsubstate and merge it within the
+same second. It should mark is are modified , even if none of mode, size and
+timestamp of it isn't changed on the filesystem (see also issue4583))
$ echo issue3276_ok > repo/s/b
$ hg -R repo2 push -f -q
- $ touch -t 200001010000 repo/.hgsubstate
- $ cat >> repo/.hg/hgrc <<EOF
- > [fakedirstatewritetime]
- > # emulate invoking dirstate.write() via repo.status()
- > # at 2000-01-01 00:00
- > fakenow = 200001010000
- >
- > [extensions]
- > fakedirstatewritetime = $TESTDIR/fakedirstatewritetime.py
- > EOF
$ hg -R repo update
b: untracked file differs
abort: untracked files in working directory differ from files in requested revision (in subrepository "s")
[255]
- $ cat >> repo/.hg/hgrc <<EOF
- > [extensions]
- > fakedirstatewritetime = !
- > EOF
$ cat repo/s/b
issue3276_ok
$ rm repo/s/b
- $ touch -t 200001010000 repo/.hgsubstate
$ hg -R repo revert --all
reverting repo/.hgsubstate
reverting subrepo s