--- c:/hgdev/src/tests/test-clone.t
+++ c:/hgdev/src/tests/test-clone.t#sshv2.err
@@ -1109,199 +1109,8 @@
[255]
$ hg --config share.pool=share -q clone -e ""$PYTHON" "$TESTDIR/dummyssh"" a ssh://user@dummy/remote
$ hg -R remote id -r 0
- acb14030fe0a
+ abort: repository remote not found!
Cloning into pooled storage doesn't race (issue5104)
$ HGPOSTLOCKDELAY=2.0 hg --config share.pool=racepool --config extensions.lockdelay=$TESTDIR/lockdelay.py clone source1a share-destrace1 > race1.log 2>&1 &
- $ HGPRELOCKDELAY=1.0 hg --config share.pool=racepool --config extensions.lockdelay=$TESTDIR/lockdelay.py clone source1a share-destrace2 > race2.log 2>&1
- $ wait
-
- $ hg -R share-destrace1 log -r tip
- changeset: 2:e5bfe23c0b47
- bookmark: bookA
- tag: tip
- user: test
- date: Thu Jan 01 00:00:00 1970 +0000
- summary: 1a
-
-
- $ hg -R share-destrace2 log -r tip
- changeset: 2:e5bfe23c0b47
- bookmark: bookA
- tag: tip
- user: test
- date: Thu Jan 01 00:00:00 1970 +0000
- summary: 1a
-
-One repo should be new, the other should be shared from the pool. We
-don't care which is which, so we just make sure we always print the
-one containing "new pooled" first, then one one containing "existing
-pooled".
-
- $ (grep 'new pooled' race1.log > /dev/null && cat race1.log || cat race2.log) | grep -v lock
- (sharing from new pooled repository b5f04eac9d8f7a6a9fcb070243cccea7dc5ea0c1)
- requesting all changes
- adding changesets
- adding manifests
- adding file changes
- added 3 changesets with 3 changes to 1 files
- new changesets b5f04eac9d8f:e5bfe23c0b47
- searching for changes
- no changes found
- adding remote bookmark bookA
- updating working directory
- 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-
- $ (grep 'existing pooled' race1.log > /dev/null && cat race1.log || cat race2.log) | grep -v lock
- (sharing from existing pooled repository b5f04eac9d8f7a6a9fcb070243cccea7dc5ea0c1)
- searching for changes
- no changes found
- adding remote bookmark bookA
- updating working directory
- 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-
-SEC: check for unsafe ssh url
-
- $ cat >> $HGRCPATH << EOF
- > [ui]
- > ssh = sh -c "read l; read l; read l"
- > EOF
-
- $ hg clone 'ssh://-oProxyCommand=touch${IFS}owned/path'
- abort: potentially unsafe url: 'ssh://-oProxyCommand=touch${IFS}owned/path'
- [255]
- $ hg clone 'ssh://%2DoProxyCommand=touch${IFS}owned/path'
- abort: potentially unsafe url: 'ssh://-oProxyCommand=touch${IFS}owned/path'
- [255]
- $ hg clone 'ssh://fakehost|touch%20owned/path'
- abort: no suitable response from remote hg!
- [255]
- $ hg clone 'ssh://fakehost%7Ctouch%20owned/path'
- abort: no suitable response from remote hg!
- [255]
-
- $ hg clone 'ssh://-oProxyCommand=touch owned%20foo@example.com/nonexistent/path'
- abort: potentially unsafe url: 'ssh://-oProxyCommand=touch owned foo@example.com/nonexistent/path'
- [255]
-
-#if windows
- $ hg clone "ssh://%26touch%20owned%20/" --debug
- running sh -c "read l; read l; read l" "&touch owned " "hg -R . serve --stdio"
- sending upgrade request: * proto=exp-ssh-v2-0003 (glob) (sshv2 !)
- sending hello command
- sending between command
- abort: no suitable response from remote hg!
- [255]
- $ hg clone "ssh://example.com:%26touch%20owned%20/" --debug
- running sh -c "read l; read l; read l" -p "&touch owned " example.com "hg -R . serve --stdio"
- sending upgrade request: * proto=exp-ssh-v2-0003 (glob) (sshv2 !)
- sending hello command
- sending between command
- abort: no suitable response from remote hg!
- [255]
-#else
- $ hg clone "ssh://%3btouch%20owned%20/" --debug
- running sh -c "read l; read l; read l" ';touch owned ' 'hg -R . serve --stdio'
- sending upgrade request: * proto=exp-ssh-v2-0003 (glob) (sshv2 !)
- sending hello command
- sending between command
- abort: no suitable response from remote hg!
- [255]
- $ hg clone "ssh://example.com:%3btouch%20owned%20/" --debug
- running sh -c "read l; read l; read l" -p ';touch owned ' example.com 'hg -R . serve --stdio'
- sending upgrade request: * proto=exp-ssh-v2-0003 (glob) (sshv2 !)
- sending hello command
- sending between command
- abort: no suitable response from remote hg!
- [255]
-#endif
-
- $ hg clone "ssh://v-alid.example.com/" --debug
- running sh -c "read l; read l; read l" v-alid\.example\.com ['"]hg -R \. serve --stdio['"] (re)
- sending upgrade request: * proto=exp-ssh-v2-0003 (glob) (sshv2 !)
- sending hello command
- sending between command
- abort: no suitable response from remote hg!
- [255]
-
-We should not have created a file named owned - if it exists, the
-attack succeeded.
- $ if test -f owned; then echo 'you got owned'; fi
-
-Cloning without fsmonitor enabled does not print a warning for small repos
-
- $ hg clone a fsmonitor-default
- updating to bookmark @ on branch stable
- 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
-
-Lower the warning threshold to simulate a large repo
-
- $ cat >> $HGRCPATH << EOF
- > [fsmonitor]
- > warn_update_file_count = 2
- > EOF
-
-We should see a warning about no fsmonitor on supported platforms
-
-#if linuxormacos no-fsmonitor
- $ hg clone a nofsmonitor
- updating to bookmark @ on branch stable
- (warning: large working directory being used without fsmonitor enabled; enable fsmonitor to improve performance; see "hg help -e fsmonitor")
- 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
-#else
- $ hg clone a nofsmonitor
- updating to bookmark @ on branch stable
- 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
-#endif
-
-We should not see warning about fsmonitor when it is enabled
-
-#if fsmonitor
- $ hg clone a fsmonitor-enabled
- updating to bookmark @ on branch stable
- 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
-#endif
-
-We can disable the fsmonitor warning
-
- $ hg --config fsmonitor.warn_when_unused=false clone a fsmonitor-disable-warning
- updating to bookmark @ on branch stable
- 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
-
-Loaded fsmonitor but disabled in config should still print warning
-
-#if linuxormacos fsmonitor
- $ hg --config fsmonitor.mode=off clone a fsmonitor-mode-off
- updating to bookmark @ on branch stable
- (warning: large working directory being used without fsmonitor enabled; enable fsmonitor to improve performance; see "hg help -e fsmonitor") (fsmonitor !)
- 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
-#endif
-
-Warning not printed if working directory isn't empty
-
- $ hg -q clone a fsmonitor-update
- (warning: large working directory being used without fsmonitor enabled; enable fsmonitor to improve performance; see "hg help -e fsmonitor") (?)
- $ cd fsmonitor-update
- $ hg up acb14030fe0a
- 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
- (leaving bookmark @)
- $ hg up cf0fe1914066
- 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-
-`hg update` from null revision also prints
-
- $ hg up null
- 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
-
-#if linuxormacos no-fsmonitor
- $ hg up cf0fe1914066
- (warning: large working directory being used without fsmonitor enabled; enable fsmonitor to improve performance; see "hg help -e fsmonitor")
- 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
-#else
- $ hg up cf0fe1914066
- 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
-#endif
-
- $ cd ..
-
test-doctest.py
--- c:/hgdev/src/tests/test-doctest.py.out
+++ c:/hgdev/src/tests/test-doctest.py.err
@@ -0,0 +1,7 @@
+Traceback (most recent call last):
+ File "c:\hgdev\src ests est-doctest.py", line 77, in <module>
+ cwd=os.path.dirname(os.environ['TESTDIR']),
+ File "c:\hgdev\python27-x64\lib\subprocess.py", line 223, in check_output
+ raise CalledProcessError(retcode, cmd, output=output)
+subprocess.CalledProcessError: Command 'hg files --print0 'set:(**.py and grep("
+\s*>>> "))'' returned non-zero exit status 1
test-hgweb.t
--- c:/hgdev/src/tests/test-hgweb.t
+++ c:/hgdev/src/tests/test-hgweb.t.err
@@ -911,6 +911,10 @@
errors
$ cat errors.log | "$PYTHON" $TESTDIR/filtertraceback.py
+ $LOCALIP - - [$ERRDATE$] Exception happened during processing request '/spam':
(esc)
+ Traceback (most recent call last):
(esc)
+ error: [Errno 10053] An established connection was aborted by the software in your host machine
(esc)
+
(esc)
$ rm -f errors.log
Uncaught exceptions result in a logged error and canned HTTP response
test-merge-force.t
--- c:/hgdev/src/tests/test-merge-force.t
+++ c:/hgdev/src/tests/test-merge-force.t.err
@@ -142,106 +142,6 @@
# in the same way, so it could potentially be left alone
$ hg merge -f --tool internal:merge3 'desc("remote")' 2>&1 | tee $TESTTMP/merge-output-1
- file 'content1_missing_content1_content4-tracked' was deleted in other [merge rev] but was modified in local [working copy].
- You can use (c)hanged version, (d)elete, or leave (u)nresolved.
- What do you want to do? u
- file 'content1_missing_content3_content3-tracked' was deleted in other [merge rev] but was modified in local [working copy].
- You can use (c)hanged version, (d)elete, or leave (u)nresolved.
- What do you want to do? u
- file 'content1_missing_content3_content4-tracked' was deleted in other [merge rev] but was modified in local [working copy].
- You can use (c)hanged version, (d)elete, or leave (u)nresolved.
- What do you want to do? u
- file 'content1_missing_missing_content4-tracked' was deleted in other [merge rev] but was modified in local [working copy].
- You can use (c)hanged version, (d)elete, or leave (u)nresolved.
- What do you want to do? u
- file 'content1_content2_content1_content1-untracked' was deleted in local [working copy] but was modified in other [merge rev].
- You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
- What do you want to do? u
- file 'content1_content2_content1_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev].
- You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
- What do you want to do? u
- file 'content1_content2_content1_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev].
- You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
- What do you want to do? u
- file 'content1_content2_content1_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev].
- You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
- What do you want to do? u
- file 'content1_content2_content1_missing-untracked' was deleted in local [working copy] but was modified in other [merge rev].
- You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
- What do you want to do? u
- file 'content1_content2_content2_content1-untracked' was deleted in local [working copy] but was modified in other [merge rev].
- You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
- What do you want to do? u
- file 'content1_content2_content2_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev].
- You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
- What do you want to do? u
- file 'content1_content2_content2_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev].
- You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
- What do you want to do? u
- file 'content1_content2_content2_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev].
- You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
- What do you want to do? u
- file 'content1_content2_content2_missing-untracked' was deleted in local [working copy] but was modified in other [merge rev].
- You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
- What do you want to do? u
- file 'content1_content2_content3_content1-untracked' was deleted in local [working copy] but was modified in other [merge rev].
- You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
- What do you want to do? u
- file 'content1_content2_content3_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev].
- You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
- What do you want to do? u
- file 'content1_content2_content3_content3-untracked' was deleted in local [working copy] but was modified in other [merge rev].
- You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
- What do you want to do? u
- file 'content1_content2_content3_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev].
- You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
- What do you want to do? u
- file 'content1_content2_content3_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev].
- You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
- What do you want to do? u
- file 'content1_content2_content3_missing-untracked' was deleted in local [working copy] but was modified in other [merge rev].
- You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
- What do you want to do? u
- file 'content1_content2_missing_content1-untracked' was deleted in local [working copy] but was modified in other [merge rev].
- You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
- What do you want to do? u
- file 'content1_content2_missing_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev].
- You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
- What do you want to do? u
- file 'content1_content2_missing_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev].
- You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
- What do you want to do? u
- file 'content1_content2_missing_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev].
- You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
- What do you want to do? u
- file 'content1_content2_missing_missing-untracked' was deleted in local [working copy] but was modified in other [merge rev].
- You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
- What do you want to do? u
- merging content1_content2_content1_content4-tracked
- merging content1_content2_content2_content1-tracked
- merging content1_content2_content2_content4-tracked
- merging content1_content2_content3_content1-tracked
- merging content1_content2_content3_content3-tracked
- merging content1_content2_content3_content4-tracked
- merging content1_content2_missing_content1-tracked
- merging content1_content2_missing_content4-tracked
- merging missing_content2_content2_content4-tracked
- merging missing_content2_content3_content3-tracked
- merging missing_content2_content3_content4-tracked
- merging missing_content2_missing_content4-tracked
- merging missing_content2_missing_content4-untracked
- warning: conflicts while merging content1_content2_content1_content4-tracked! (edit, then use 'hg resolve --mark')
- warning: conflicts while merging content1_content2_content2_content4-tracked! (edit, then use 'hg resolve --mark')
- warning: conflicts while merging content1_content2_content3_content3-tracked! (edit, then use 'hg resolve --mark')
- warning: conflicts while merging content1_content2_content3_content4-tracked! (edit, then use 'hg resolve --mark')
- warning: conflicts while merging content1_content2_missing_content4-tracked! (edit, then use 'hg resolve --mark')
- warning: conflicts while merging missing_content2_content2_content4-tracked! (edit, then use 'hg resolve --mark')
- warning: conflicts while merging missing_content2_content3_content3-tracked! (edit, then use 'hg resolve --mark')
- warning: conflicts while merging missing_content2_content3_content4-tracked! (edit, then use 'hg resolve --mark')
- warning: conflicts while merging missing_content2_missing_content4-tracked! (edit, then use 'hg resolve --mark')
- warning: conflicts while merging missing_content2_missing_content4-untracked! (edit, then use 'hg resolve --mark')
- 18 files updated, 3 files merged, 8 files removed, 35 files unresolved
- use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
Check which files need to be resolved (should correspond to the output above).
This should be the files for which the base (1st filename segment), the remote
@@ -252,20 +152,22 @@
$ hg resolve -l
U content1_content2_content1_content1-untracked
+ U content1_content2_content1_content2-tracked
U content1_content2_content1_content2-untracked
U content1_content2_content1_content4-tracked
U content1_content2_content1_content4-untracked
U content1_content2_content1_missing-tracked
U content1_content2_content1_missing-untracked
- R content1_content2_content2_content1-tracked
+ U content1_content2_content2_content1-tracked
U content1_content2_content2_content1-untracked
U content1_content2_content2_content2-untracked
U content1_content2_content2_content4-tracked
U content1_content2_content2_content4-untracked
U content1_content2_content2_missing-tracked
U content1_content2_content2_missing-untracked
- R content1_content2_content3_content1-tracked
+ U content1_content2_content3_content1-tracked
U content1_content2_content3_content1-untracked
+ U content1_content2_content3_content2-tracked
U content1_content2_content3_content2-untracked
U content1_content2_content3_content3-tracked
U content1_content2_content3_content3-untracked
@@ -273,8 +175,9 @@
U content1_content2_content3_content4-untracked
U content1_content2_content3_missing-tracked
U content1_content2_content3_missing-untracked
- R content1_content2_missing_content1-tracked
+ U content1_content2_missing_content1-tracked
U content1_content2_missing_content1-untracked
+ U content1_content2_missing_content2-tracked
U content1_content2_missing_content2-untracked
U content1_content2_missing_content4-tracked
U content1_content2_missing_content4-untracked
@@ -285,8 +188,10 @@
U content1_missing_content3_content4-tracked
U content1_missing_missing_content4-tracked
U missing_content2_content2_content4-tracked
+ U missing_content2_content3_content2-tracked
U missing_content2_content3_content3-tracked
U missing_content2_content3_content4-tracked
+ U missing_content2_missing_content2-tracked
U missing_content2_missing_content4-tracked
U missing_content2_missing_content4-untracked
@@ -388,136 +293,106 @@
M content1_content2_content1_content1-tracked
content2
- M content1_content2_content1_content1-untracked
+ R content1_content2_content1_content1-untracked
content2
M content1_content2_content1_content2-tracked
content2
- M content1_content2_content1_content2-untracked
+ R content1_content2_content1_content2-untracked
content2
M content1_content2_content1_content4-tracked
- <<<<<<< working copy: 0447570f1af6 - test: local
- content4
- ||||||| base
- content1
- =======
- content2
- >>>>>>> merge rev: 85100b8c675b - test: remote
-
- M content1_content2_content1_content4-untracked
+ content4
+
+ R content1_content2_content1_content4-untracked
content2
M content1_content2_content1_missing-tracked
content2
- M content1_content2_content1_missing-untracked
+ R content1_content2_content1_missing-untracked
content2
M content1_content2_content2_content1-tracked
- content2
-
- M content1_content2_content2_content1-untracked
+ content1
+
+ R content1_content2_content2_content1-untracked
content2
C content1_content2_content2_content2-tracked
content2
- M content1_content2_content2_content2-untracked
+ R content1_content2_content2_content2-untracked
content2
M content1_content2_content2_content4-tracked
- <<<<<<< working copy: 0447570f1af6 - test: local
- content4
- ||||||| base
- content1
- =======
- content2
- >>>>>>> merge rev: 85100b8c675b - test: remote
-
- M content1_content2_content2_content4-untracked
- content2
-
- M content1_content2_content2_missing-tracked
- content2
-
- M content1_content2_content2_missing-untracked
+ content4
+
+ R content1_content2_content2_content4-untracked
+ content2
+
+ C content1_content2_content2_missing-tracked
+ content2
+
+ R content1_content2_content2_missing-untracked
content2
M content1_content2_content3_content1-tracked
- content2
-
- M content1_content2_content3_content1-untracked
+ content1
+
+ R content1_content2_content3_content1-untracked
content2
M content1_content2_content3_content2-tracked
content2
- M content1_content2_content3_content2-untracked
- content2
-
- M content1_content2_content3_content3-tracked
- <<<<<<< working copy: 0447570f1af6 - test: local
+ R content1_content2_content3_content2-untracked
+ content2
+
+ C content1_content2_content3_content3-tracked
content3
- ||||||| base
- content1
- =======
- content2
- >>>>>>> merge rev: 85100b8c675b - test: remote
-
- M content1_content2_content3_content3-untracked
+
+ R content1_content2_content3_content3-untracked
content2
M content1_content2_content3_content4-tracked
- <<<<<<< working copy: 0447570f1af6 - test: local
- content4
- ||||||| base
- content1
- =======
- content2
- >>>>>>> merge rev: 85100b8c675b - test: remote
-
- M content1_content2_content3_content4-untracked
- content2
-
- M content1_content2_content3_missing-tracked
- content2
-
- M content1_content2_content3_missing-untracked
- content2
-
- M content1_content2_missing_content1-tracked
- content2
-
- M content1_content2_missing_content1-untracked
- content2
-
- M content1_content2_missing_content2-tracked
- content2
-
- M content1_content2_missing_content2-untracked
- content2
-
- M content1_content2_missing_content4-tracked
- <<<<<<< working copy: 0447570f1af6 - test: local
- content4
- ||||||| base
- content1
- =======
- content2
- >>>>>>> merge rev: 85100b8c675b - test: remote
-
- M content1_content2_missing_content4-untracked
- content2
-
- M content1_content2_missing_missing-tracked
- content2
-
- M content1_content2_missing_missing-untracked
- content2
-
- R content1_missing_content1_content1-tracked
+ content4
+
+ R content1_content2_content3_content4-untracked
+ content2
+
+ ! content1_content2_content3_missing-tracked
+ <missing>
+
+ R content1_content2_content3_missing-untracked
+ <missing>
+
+ A content1_content2_missing_content1-tracked
+ content1
+
+ ? content1_content2_missing_content1-untracked
+ content1
+
+ A content1_content2_missing_content2-tracked
+ content2
+
+ ? content1_content2_missing_content2-untracked
+ content2
+
+ A content1_content2_missing_content4-tracked
+ content4
+
+ ? content1_content2_missing_content4-untracked
+ content4
+
+ ! content1_content2_missing_missing-tracked
+ <missing>
+
+ content1_content2_missing_missing-untracked: $ENOENT$
+ <missing>
+
+ ! content1_missing_content1_content1-tracked
<missing>
R content1_missing_content1_content1-untracked
@@ -529,13 +404,13 @@
R content1_missing_content1_content4-untracked
content4
- R content1_missing_content1_missing-tracked
+ ! content1_missing_content1_missing-tracked
<missing>
R content1_missing_content1_missing-untracked
<missing>
- R content1_missing_content3_content1-tracked
+ ! content1_missing_content3_content1-tracked
<missing>
R content1_missing_content3_content1-untracked
@@ -553,13 +428,13 @@
R content1_missing_content3_content4-untracked
content4
- R content1_missing_content3_missing-tracked
+ ! content1_missing_content3_missing-tracked
<missing>
R content1_missing_content3_missing-untracked
<missing>
- R content1_missing_missing_content1-tracked
+ ! content1_missing_missing_content1-tracked
<missing>
? content1_missing_missing_content1-untracked
@@ -571,95 +446,70 @@
? content1_missing_missing_content4-untracked
content4
- R content1_missing_missing_missing-tracked
- <missing>
-
- content1_missing_missing_missing-untracked: * (glob)
+ ! content1_missing_missing_missing-tracked
+ <missing>
+
+ content1_missing_missing_missing-untracked: $ENOENT$
<missing>
C missing_content2_content2_content2-tracked
content2
- M missing_content2_content2_content2-untracked
+ R missing_content2_content2_content2-untracked
content2
M missing_content2_content2_content4-tracked
- <<<<<<< working copy: 0447570f1af6 - test: local
- content4
- ||||||| base
- =======
- content2
- >>>>>>> merge rev: 85100b8c675b - test: remote
-
- M missing_content2_content2_content4-untracked
- content2
-
- M missing_content2_content2_missing-tracked
- content2
-
- M missing_content2_content2_missing-untracked
+ content4
+
+ R missing_content2_content2_content4-untracked
+ content2
+
+ C missing_content2_content2_missing-tracked
+ content2
+
+ R missing_content2_content2_missing-untracked
content2
M missing_content2_content3_content2-tracked
content2
- M missing_content2_content3_content2-untracked
- content2
-
- M missing_content2_content3_content3-tracked
- <<<<<<< working copy: 0447570f1af6 - test: local
+ R missing_content2_content3_content2-untracked
+ content2
+
+ C missing_content2_content3_content3-tracked
content3
- ||||||| base
- =======
- content2
- >>>>>>> merge rev: 85100b8c675b - test: remote
-
- M missing_content2_content3_content3-untracked
+
+ R missing_content2_content3_content3-untracked
content2
M missing_content2_content3_content4-tracked
- <<<<<<< working copy: 0447570f1af6 - test: local
- content4
- ||||||| base
- =======
- content2
- >>>>>>> merge rev: 85100b8c675b - test: remote
-
- M missing_content2_content3_content4-untracked
+ content4
+
+ R missing_content2_content3_content4-untracked
content2
M missing_content2_content3_missing-tracked
content2
- M missing_content2_content3_missing-untracked
- content2
-
- M missing_content2_missing_content2-tracked
- content2
-
- M missing_content2_missing_content2-untracked
- content2
-
- M missing_content2_missing_content4-tracked
- <<<<<<< working copy: 0447570f1af6 - test: local
- content4
- ||||||| base
- =======
- content2
- >>>>>>> merge rev: 85100b8c675b - test: remote
-
- M missing_content2_missing_content4-untracked
- <<<<<<< working copy: 0447570f1af6 - test: local
- content4
- ||||||| base
- =======
- content2
- >>>>>>> merge rev: 85100b8c675b - test: remote
-
- M missing_content2_missing_missing-tracked
- content2
-
- M missing_content2_missing_missing-untracked
+ R missing_content2_content3_missing-untracked
+ content2
+
+ A missing_content2_missing_content2-tracked
+ content2
+
+ ? missing_content2_missing_content2-untracked
+ content2
+
+ A missing_content2_missing_content4-tracked
+ content4
+
+ ? missing_content2_missing_content4-untracked
+ content4
+
+ A missing_content2_missing_missing-tracked
+ content2
+
+ ? missing_content2_missing_missing-untracked
content2
C missing_missing_content3_content3-tracked
@@ -674,7 +524,7 @@
R missing_missing_content3_content4-untracked
content4
- R missing_missing_content3_missing-tracked
+ ! missing_missing_content3_missing-tracked
<missing>
R missing_missing_content3_missing-untracked
@@ -686,10 +536,10 @@
? missing_missing_missing_content4-untracked
content4
- R missing_missing_missing_missing-tracked
- <missing>
-
- missing_missing_missing_missing-untracked: * (glob)
+ ! missing_missing_missing_missing-tracked
+ <missing>
+
+ missing_missing_missing_missing-untracked: $ENOENT$
<missing>
$ for f in `"$PYTHON" $TESTDIR/generate-working-copy-states.py filelist 3`
@@ -700,26 +550,6 @@
> cat ${f}.orig
> fi
> done
- content1_content2_content1_content4-tracked.orig:
- content4
- content1_content2_content2_content4-tracked.orig:
- content4
- content1_content2_content3_content3-tracked.orig:
- content3
- content1_content2_content3_content4-tracked.orig:
- content4
- content1_content2_missing_content4-tracked.orig:
- content4
- missing_content2_content2_content4-tracked.orig:
- content4
- missing_content2_content3_content3-tracked.orig:
- content3
- missing_content2_content3_content4-tracked.orig:
- content4
- missing_content2_missing_content4-tracked.orig:
- content4
- missing_content2_missing_content4-untracked.orig:
- content4
Re-resolve and check status
@@ -829,6 +659,310 @@
[1]
$ checkstatus > $TESTTMP/status2 2>&1
$ cmp $TESTTMP/status1 $TESTTMP/status2 || diff -U8 $TESTTMP/status1 $TESTTMP/status2
+ $TESTTMP/status1 $TESTTMP/status2 differ: char 1233, line 65
+ --- $TESTTMP/status1 2020-03-24 23:15:52 +0000
+ +++ $TESTTMP/status2 2020-03-24 23:16:18 +0000
+ @@ -57,122 +57,152 @@
+ <missing>
+
+ content1_content1_missing_missing-untracked: $ENOENT$
+ <missing>
+
+ M content1_content2_content1_content1-tracked
+ content2
+
+ -R content1_content2_content1_content1-untracked
+ +C content1_content2_content1_content1-untracked
+ content2
+
+ M content1_content2_content1_content2-tracked
+ content2
+
+ -R content1_content2_content1_content2-untracked
+ +C content1_content2_content1_content2-untracked
+ content2
+
+ M content1_content2_content1_content4-tracked
+ +<<<<<<< working copy: 0447570f1af6 - test: local
+ content4
+ +||||||| base
+ +content1
+ +=======
+ +content2
+ +>>>>>>> merge rev: 85100b8c675b - test: remote
+
+ -R content1_content2_content1_content4-untracked
+ +C content1_content2_content1_content4-untracked
+ content2
+
+ -M content1_content2_content1_missing-tracked
+ +C content1_content2_content1_missing-tracked
+ content2
+
+ -R content1_content2_content1_missing-untracked
+ +C content1_content2_content1_missing-untracked
+ content2
+
+ -M content1_content2_content2_content1-tracked
+ -content1
+ +C content1_content2_content2_content1-tracked
+ +content2
+
+ -R content1_content2_content2_content1-untracked
+ +C content1_content2_content2_content1-untracked
+ content2
+
+ C content1_content2_content2_content2-tracked
+ content2
+
+ -R content1_content2_content2_content2-untracked
+ +C content1_content2_content2_content2-untracked
+ content2
+
+ M content1_content2_content2_content4-tracked
+ +<<<<<<< working copy: 0447570f1af6 - test: local
+ content4
+ +||||||| base
+ +content1
+ +=======
+ +content2
+ +>>>>>>> merge rev: 85100b8c675b - test: remote
+
+ -R content1_content2_content2_content4-untracked
+ +C content1_content2_content2_content4-untracked
+ content2
+
+ C content1_content2_content2_missing-tracked
+ content2
+
+ -R content1_content2_content2_missing-untracked
+ +C content1_content2_content2_missing-untracked
+ content2
+
+ M content1_content2_content3_content1-tracked
+ -content1
+ +content2
+
+ -R content1_content2_content3_content1-untracked
+ +M content1_content2_content3_content1-untracked
+ content2
+
+ M content1_content2_content3_content2-tracked
+ content2
+
+ -R content1_content2_content3_content2-untracked
+ +M content1_content2_content3_content2-untracked
+ content2
+
+ -C content1_content2_content3_content3-tracked
+ +M content1_content2_content3_content3-tracked
+ +<<<<<<< working copy: 0447570f1af6 - test: local
+ content3
+ +||||||| base
+ +content1
+ +=======
+ +content2
+ +>>>>>>> merge rev: 85100b8c675b - test: remote
+
+ -R content1_content2_content3_content3-untracked
+ +M content1_content2_content3_content3-untracked
+ content2
+
+ M content1_content2_content3_content4-tracked
+ +<<<<<<< working copy: 0447570f1af6 - test: local
+ content4
+ +||||||| base
+ +content1
+ +=======
+ +content2
+ +>>>>>>> merge rev: 85100b8c675b - test: remote
+
+ -R content1_content2_content3_content4-untracked
+ +M content1_content2_content3_content4-untracked
+ content2
+
+ -! content1_content2_content3_missing-tracked
+ -<missing>
+ +M content1_content2_content3_missing-tracked
+ +content2
+
+ -R content1_content2_content3_missing-untracked
+ -<missing>
+ +M content1_content2_content3_missing-untracked
+ +content2
+
+ A content1_content2_missing_content1-tracked
+ -content1
+ +content2
+
+ -? content1_content2_missing_content1-untracked
+ -content1
+ +M content1_content2_missing_content1-untracked
+ +content2
+
+ A content1_content2_missing_content2-tracked
+ content2
+
+ -? content1_content2_missing_content2-untracked
+ +M content1_content2_missing_content2-untracked
+ content2
+
+ A content1_content2_missing_content4-tracked
+ +<<<<<<< working copy: 0447570f1af6 - test: local
+ content4
+ +||||||| base
+ +content1
+ +=======
+ +content2
+ +>>>>>>> merge rev: 85100b8c675b - test: remote
+
+ -? content1_content2_missing_content4-untracked
+ -content4
+ +M content1_content2_missing_content4-untracked
+ +content2
+
+ -! content1_content2_missing_missing-tracked
+ -<missing>
+ +M content1_content2_missing_missing-tracked
+ +content2
+
+ -content1_content2_missing_missing-untracked: $ENOENT$
+ -<missing>
+ +M content1_content2_missing_missing-untracked
+ +content2
+
+ ! content1_missing_content1_content1-tracked
+ <missing>
+
+ R content1_missing_content1_content1-untracked
+ content1
+
+ -M content1_missing_content1_content4-tracked
+ +A content1_missing_content1_content4-tracked
+ content4
+
+ R content1_missing_content1_content4-untracked
+ content4
+
+ ! content1_missing_content1_missing-tracked
+ <missing>
+
+ @@ -180,23 +210,23 @@
+ <missing>
+
+ ! content1_missing_content3_content1-tracked
+ <missing>
+
+ R content1_missing_content3_content1-untracked
+ content1
+
+ -C content1_missing_content3_content3-tracked
+ +A content1_missing_content3_content3-tracked
+ content3
+
+ R content1_missing_content3_content3-untracked
+ content3
+
+ -M content1_missing_content3_content4-tracked
+ +A content1_missing_content3_content4-tracked
+ content4
+
+ R content1_missing_content3_content4-untracked
+ content4
+
+ ! content1_missing_content3_missing-tracked
+ <missing>
+
+ @@ -223,41 +253,56 @@
+
+ C missing_content2_content2_content2-tracked
+ content2
+
+ R missing_content2_content2_content2-untracked
+ content2
+
+ M missing_content2_content2_content4-tracked
+ +<<<<<<< working copy: 0447570f1af6 - test: local
+ content4
+ +||||||| base
+ +=======
+ +content2
+ +>>>>>>> merge rev: 85100b8c675b - test: remote
+
+ R missing_content2_content2_content4-untracked
+ content2
+
+ C missing_content2_content2_missing-tracked
+ content2
+
+ R missing_content2_content2_missing-untracked
+ content2
+
+ M missing_content2_content3_content2-tracked
+ content2
+
+ R missing_content2_content3_content2-untracked
+ content2
+
+ -C missing_content2_content3_content3-tracked
+ +M missing_content2_content3_content3-tracked
+ +<<<<<<< working copy: 0447570f1af6 - test: local
+ content3
+ +||||||| base
+ +=======
+ +content2
+ +>>>>>>> merge rev: 85100b8c675b - test: remote
+
+ R missing_content2_content3_content3-untracked
+ content2
+
+ M missing_content2_content3_content4-tracked
+ +<<<<<<< working copy: 0447570f1af6 - test: local
+ content4
+ +||||||| base
+ +=======
+ +content2
+ +>>>>>>> merge rev: 85100b8c675b - test: remote
+
+ R missing_content2_content3_content4-untracked
+ content2
+
+ M missing_content2_content3_missing-tracked
+ content2
+
+ R missing_content2_content3_missing-untracked
+ @@ -265,20 +310,30 @@
+
+ A missing_content2_missing_content2-tracked
+ content2
+
+ ? missing_content2_missing_content2-untracked
+ content2
+
+ A missing_content2_missing_content4-tracked
+ +<<<<<<< working copy: 0447570f1af6 - test: local
+ content4
+ +||||||| base
+ +=======
+ +content2
+ +>>>>>>> merge rev: 85100b8c675b - test: remote
+
+ ? missing_content2_missing_content4-untracked
+ +<<<<<<< working copy: 0447570f1af6 - test: local
+ content4
+ +||||||| base
+ +=======
+ +content2
+ +>>>>>>> merge rev: 85100b8c675b - test: remote
+
+ A missing_content2_missing_missing-tracked
+ content2
+
+ ? missing_content2_missing_missing-untracked
+ content2
+
+ C missing_missing_content3_content3-tracked
+ [1]
Set up working directory again
@@ -843,3 +977,108 @@
$ hg merge -f --tool internal:merge3 'desc("remote")' --config merge.checkunknown=warn > $TESTTMP/merge-output-2 2>&1
[1]
$ cmp $TESTTMP/merge-output-1 $TESTTMP/merge-output-2 || diff -U8 $TESTTMP/merge-output-1 $TESTTMP/merge-output-2
+ cmp: EOF on $TESTTMP/merge-output-1
+ --- $TESTTMP/merge-output-1 2020-03-24 23:15:27 +0000
+ +++ $TESTTMP/merge-output-2 2020-03-24 23:16:20 +0000
+ @@ -0,0 +1,100 @@
+ +file 'content1_missing_content1_content4-tracked' was deleted in other [merge rev] but was modified in local [working copy].
+ +You can use (c)hanged version, (d)elete, or leave (u)nresolved.
+ +What do you want to do? u
+ +file 'content1_missing_content3_content3-tracked' was deleted in other [merge rev] but was modified in local [working copy].
+ +You can use (c)hanged version, (d)elete, or leave (u)nresolved.
+ +What do you want to do? u
+ +file 'content1_missing_content3_content4-tracked' was deleted in other [merge rev] but was modified in local [working copy].
+ +You can use (c)hanged version, (d)elete, or leave (u)nresolved.
+ +What do you want to do? u
+ +file 'content1_missing_missing_content4-tracked' was deleted in other [merge rev] but was modified in local [working copy].
+ +You can use (c)hanged version, (d)elete, or leave (u)nresolved.
+ +What do you want to do? u
+ +file 'content1_content2_content1_content1-untracked' was deleted in local [working copy] but was modified in other [merge rev].
+ +You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
+ +What do you want to do? u
+ +file 'content1_content2_content1_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev].
+ +You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
+ +What do you want to do? u
+ +file 'content1_content2_content1_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev].
+ +You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
+ +What do you want to do? u
+ +file 'content1_content2_content1_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev].
+ +You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
+ +What do you want to do? u
+ +file 'content1_content2_content1_missing-untracked' was deleted in local [working copy] but was modified in other [merge rev].
+ +You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
+ +What do you want to do? u
+ +file 'content1_content2_content2_content1-untracked' was deleted in local [working copy] but was modified in other [merge rev].
+ +You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
+ +What do you want to do? u
+ +file 'content1_content2_content2_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev].
+ +You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
+ +What do you want to do? u
+ +file 'content1_content2_content2_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev].
+ +You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
+ +What do you want to do? u
+ +file 'content1_content2_content2_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev].
+ +You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
+ +What do you want to do? u
+ +file 'content1_content2_content2_missing-untracked' was deleted in local [working copy] but was modified in other [merge rev].
+ +You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
+ +What do you want to do? u
+ +file 'content1_content2_content3_content1-untracked' was deleted in local [working copy] but was modified in other [merge rev].
+ +You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
+ +What do you want to do? u
+ +file 'content1_content2_content3_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev].
+ +You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
+ +What do you want to do? u
+ +file 'content1_content2_content3_content3-untracked' was deleted in local [working copy] but was modified in other [merge rev].
+ +You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
+ +What do you want to do? u
+ +file 'content1_content2_content3_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev].
+ +You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
+ +What do you want to do? u
+ +file 'content1_content2_content3_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev].
+ +You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
+ +What do you want to do? u
+ +file 'content1_content2_content3_missing-untracked' was deleted in local [working copy] but was modified in other [merge rev].
+ +You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
+ +What do you want to do? u
+ +file 'content1_content2_missing_content1-untracked' was deleted in local [working copy] but was modified in other [merge rev].
+ +You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
+ +What do you want to do? u
+ +file 'content1_content2_missing_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev].
+ +You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
+ +What do you want to do? u
+ +file 'content1_content2_missing_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev].
+ +You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
+ +What do you want to do? u
+ +file 'content1_content2_missing_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev].
+ +You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
+ +What do you want to do? u
+ +file 'content1_content2_missing_missing-untracked' was deleted in local [working copy] but was modified in other [merge rev].
+ +You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
+ +What do you want to do? u
+ +merging content1_content2_content1_content4-tracked
+ +merging content1_content2_content2_content1-tracked
+ +merging content1_content2_content2_content4-tracked
+ +merging content1_content2_content3_content1-tracked
+ +merging content1_content2_content3_content3-tracked
+ +merging content1_content2_content3_content4-tracked
+ +merging content1_content2_missing_content1-tracked
+ +merging content1_content2_missing_content4-tracked
+ +merging missing_content2_content2_content4-tracked
+ +merging missing_content2_content3_content3-tracked
+ +merging missing_content2_content3_content4-tracked
+ +merging missing_content2_missing_content4-tracked
+ +merging missing_content2_missing_content4-untracked
+ +warning: conflicts while merging content1_content2_content1_content4-tracked! (edit, then use 'hg resolve --mark')
+ +warning: conflicts while merging content1_content2_content2_content4-tracked! (edit, then use 'hg resolve --mark')
+ +warning: conflicts while merging content1_content2_content3_content3-tracked! (edit, then use 'hg resolve --mark')
+ +warning: conflicts while merging content1_content2_content3_content4-tracked! (edit, then use 'hg resolve --mark')
+ +warning: conflicts while merging content1_content2_missing_content4-tracked! (edit, then use 'hg resolve --mark')
+ +warning: conflicts while merging missing_content2_content2_content4-tracked! (edit, then use 'hg resolve --mark')
+ +warning: conflicts while merging missing_content2_content3_content3-tracked! (edit, then use 'hg resolve --mark')
+ +warning: conflicts while merging missing_content2_content3_content4-tracked! (edit, then use 'hg resolve --mark')
+ +warning: conflicts while merging missing_content2_missing_content4-tracked! (edit, then use 'hg resolve --mark')
+ +warning: conflicts while merging missing_content2_missing_content4-untracked! (edit, then use 'hg resolve --mark')
+ +18 files updated, 3 files merged, 8 files removed, 35 files unresolved
+ +use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
+ [1]
test-persistent-nodemap.t
UnicodeDecodeError('unicodeescape', '--- c:/hgdev/src/tests/test-persistent-nodemap.t\n+++ c:/hgdev/src/tests/test-persistent-nodemap.t.err\n@@ -58,9 +58,26 @@\n $ f --sha256 .hg/store/00changelog-*.nd\n .hg/store/00changelog-????????????????.nd: sha256=b961925120e1c9bc345c199b2cc442abc477029fdece37ef9d99cbe59c0558b7 (glob)\n $ hg debugnodemap --dump-new | f --sha256 --size\n- size=122880, sha256=b961925120e1c9bc345c199b2cc442abc477029fdece37ef9d99cbe59c0558b7\n+ size=16110, sha256=1670ff5d3f5ec56c5452d385212b76f37d6466a823ad861a1b7eea218e5c8fe2\\r (esc)\n+ ** unknown exception encountered, please report by visiting\n+ ** https://mercurial-scm.org/wiki/BugTracker\n+ ** Python 2.7.17 (v2.7.17:c2f86d86e6, Oct 19 2019, 21:01:17) [MSC v.1500 64 bit (AMD64)]\n+ ** Mercurial Distributed SCM (version 5.3.1+400-496868f1030c)\n+ ** Extensions loaded: \n+ Traceback (most recent call last):\n+ File "C:\\Temp\\hgtests.asd58f\\install\\bin\\hg", line 43, in <module>\n+ dispatch.run()\n+ File "C:\\Temp\\hgtests.asd58f\\install\\lib\\python\\mercurial\\dispatch.py", line 111, in run\n+ status = dispatch(req)\n+ File "C:\\Temp\\hgtests.asd58f\\install\\lib\\python\\mercurial\\dispatch.py", line 277, in dispatch\n+ req.ui.flush()\n+ File "C:\\Temp\\hgtests.asd58f\\install\\lib\\python\\mercurial\\ui.py", line 1230, in flush\n+ self._fout.flush()\n+ File "C:\\Temp\\hgtests.asd58f\\install\\lib\\python\\mercurial\\windows.py", line 224, in flush\n+ return self.fp.flush()\n+ ValueError: I/O operation on closed file\n $ hg debugnodemap --dump-disk | f --sha256 --bytes=256 --hexdump --size\n- size=122880, sha256=b961925120e1c9bc345c199b2cc442abc477029fdece37ef9d99cbe59c0558b7\n+ size=16110, sha256=1670ff5d3f5ec56c5452d385212b76f37d6466a823ad861a1b7eea218e5c8fe2\\r (esc)\n 0000: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|\n 0010: ff ff ff ff ff ff ff ff ff ff fa c2 ff ff ff ff |................|\n 0020: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|\n@@ -77,6 +94,23 @@\n 00d0: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|\n 00e0: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|\n 00f0: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff |................|\n+ ** unknown exception encountered, please report by visiting\n+ ** https://mercurial-scm.org/wiki/BugTracker\n+ ** Python 2.7.17 (v2.7.17:c2f86d86e6, Oct 19 2019, 21:01:17) [MSC v.1500 64 bit (AMD64)]\n+ ** Mercurial Distributed SCM (version 5.3.1+400-496868f1030c)\n+ ** Extensions loaded: \n+ Traceback (most recent call last):\n+ File "C:\\Temp\\hgtests.asd58f\\install\\bin\\hg", line 43, in <module>\n+ dispatch.run()\n+ File "C:\\Temp\\hgtests.asd58f\\install\\lib\\python\\mercurial\\dispatch.py", line 111, in run\n+ status = dispatch(req)\n+ File "C:\\Temp\\hgtests.asd58f\\install\\lib\\python\\mercurial\\dispatch.py", line 277, in dispatch\n+ req.ui.flush()\n+ File "C:\\Temp\\hgtests.asd58f\\install\\lib\\python\\mercurial\\ui.py", line 1230, in flush\n+ self._fout.flush()\n+ File "C:\\Temp\\hgtests.asd58f\\install\\lib\\python\\mercurial\\windows.py", line 224, in flush\n+ return self.fp.flush()\n+ ValueError: I/O operation on closed file\n \n #endif\n \n', 1257, 1259, 'truncated \\uXXXX escape') decoding diff, sorry