##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

localrepo: make journal.dirstate contain in-memory changes before transaction...
localrepo: make journal.dirstate contain in-memory changes before transaction Before this patch, in-memory dirstate changes aren't written out at opening transaction, even though 'journal.dirstate' is created directly from '.hg/dirstate'. Therefore, subsequent 'hg rollback' uses incomplete 'undo.dirstate' to restore dirstate, if dirstate is changed and isn't written out before opening transaction. In cases below, the condition "dirstate is changed and isn't written out before opening transaction" isn't satisfied and this problem doesn't appear: - "wlock scope" and "transaction scope" are almost equivalent e.g. 'commit --amend', 'import' and so on - dirstate changes are written out before opening transaction e.g. 'rebase' (via 'dirstateguard') and 'commit -A' (by separated wlock scopes) On the other hand, 'backout' may satisfy the condition above. To make 'journal.dirstate' contain in-memory changes before opening transaction, this patch explicitly invokes 'dirstate.write()' in 'localrepository.transaction()'. 'dirstate.write()' is placed before not "writing journal files out" but "invoking pretxnopen hooks" for visibility of dirstate changes to external hook processes. BTW, in the test script, 'touch -t 200001010000' and 'hg status' are invoked to make file 'c' surely clean in dirstate, because "clean but unsure" files indirectly cause 'dirstate.write()' at 'repo.status()' in 'repo.commit()' (see fe03f522dda9 for detail) and prevents from certainly reproducing the issue.
Peter Arrenbrecht - - Load All Authors

File last commit:

r14162:301725c3 default
r25878:800e090e stable
Show More
test-empty-group.t
127 lines | 3.0 KiB | text/troff | Tads3Lexer
/ tests / test-empty-group.t
History | Annotation | Raw |Copy content |Copy permalink
# A B
#
# 3 4 3
# |\/| |\
# |/\| | \
# 1 2 1 2
# \ / \ /
# 0 0
#
# if the result of the merge of 1 and 2
# is the same in 3 and 4, no new manifest
# will be created and the manifest group
# will be empty during the pull
#
# (plus we test a failure where outgoing
# wrongly reported the number of csets)
$ hg init a
$ cd a
$ touch init
$ hg ci -A -m 0
adding init
$ touch x y
$ hg ci -A -m 1
adding x
adding y
$ hg update 0
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ touch x y
$ hg ci -A -m 2
adding x
adding y
created new head
$ hg merge 1
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg ci -A -m m1
$ hg update -C 1
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge 2
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg ci -A -m m2
created new head
$ cd ..
$ hg clone -r 3 a b
adding changesets
adding manifests
adding file changes
added 4 changesets with 3 changes to 3 files
updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg clone -r 4 a c
adding changesets
adding manifests
adding file changes
added 4 changesets with 3 changes to 3 files
updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg -R a outgoing b
comparing with b
searching for changes
changeset: 4:1ec3c74fc0e0
tag: tip
parent: 1:79f9e10cd04e
parent: 2:8e1bb01c1a24
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: m2
$ hg -R a outgoing c
comparing with c
searching for changes
changeset: 3:d15a0c284984
parent: 2:8e1bb01c1a24
parent: 1:79f9e10cd04e
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: m1
$ hg -R b outgoing c
comparing with c
searching for changes
changeset: 3:d15a0c284984
tag: tip
parent: 2:8e1bb01c1a24
parent: 1:79f9e10cd04e
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: m1
$ hg -R c outgoing b
comparing with b
searching for changes
changeset: 3:1ec3c74fc0e0
tag: tip
parent: 1:79f9e10cd04e
parent: 2:8e1bb01c1a24
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: m2
$ hg -R b pull a
pulling from a
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 0 changes to 0 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg -R c pull a
pulling from a
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 0 changes to 0 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)