Mercurial > hg
view tests/test-merge-combination-misc.t @ 50195:11e6eee4b063
transaction: use the standard transaction mechanism to backup branch
Branch is a bit special :
- It currently does not collaborate with the transaction (or any scoping) for
writing (this is bad)
- It can change without the lock being taken (it is protected by `wlock`)
So we rely on the same mechanism as for the backup of the other dirstate file:
- we only do a backup if we hold the wlock
- we force a backup though the transaction
Since "branch" write does not collaborate with the transaction, we cannot back
it up "at the last minute" as we do for the dirstate. We have to back it up
"upfront". Since we have a backup, the transaction is no longer doing its
"quick_abort" and get noisy. Which is quite annoying. To work around this, and
to avoid jumping in yet-another-rabbit-hole of "getting branch written
properly", I am doing horrible things to the transaction in the meantime.
We should be able to get this code go away during the next cycle.
In the meantime, I prefer to take this small stop so that we stop abusing the
"journal" and "undo" mechanism instead of the proper backup mechanism of the
transaction.
Also note that this change regress the warning message for the legacy fallback
introduced in 2008 when issue902 got fixed in dd5a501cb97f (Mercurial 1.0).
I feel like this is fine as issue 902 remains fixed, and this would only affect
people deploying a mix of 15 year old Mercurial and modern mercurial, and using
branch and rollback extensively.
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Thu, 23 Feb 2023 15:37:46 +0100 |
parents | e8b0c519dfb3 |
children |
line wrap: on
line source
Testing recorded "modified" files for merge commit ================================================== This file shows what hg says are "modified" files for a merge commit (hg log -T {files}), somewhat exhaustively. This file test multiple corner case. For merges that involve files contents changing, check test-merge-combination-file-content.t For merges that involve executable bit changing, check test-merge-combination-exec-bytes.t Case with multiple or zero merge ancestors, copies/renames, and identical file contents with different filelog revisions are not currently covered. $ . $TESTDIR/testlib/merge-combination-util.sh Files modified or cleanly merged, with no greatest common ancestors: $ hg init repo; cd repo $ touch a0 b0; hg commit -qAm 0 $ hg up -qr null; touch a1 b1; hg commit -qAm 1 $ hg merge -qr 0; rm b*; hg commit -qAm 2 $ hg log -r . -T '{files}\n' b0 b1 $ cd ../ $ rm -rf repo A few cases of criss-cross merges involving deletions (listing all such merges is probably too much). Both gcas contain $files, so we expect the final merge to behave like a merge with a single gca containing $files. $ hg init repo; cd repo $ files="c1 u1 c2 u2" $ touch $files; hg commit -qAm '0 root' $ for f in $files; do echo f > $f; done; hg commit -qAm '1 gca1' $ hg up -qr0; hg revert -qr 1 --all; hg commit -qAm '2 gca2' $ hg up -qr 1; hg merge -qr 2; rm *1; hg commit -qAm '3 p1' $ hg up -qr 2; hg merge -qr 1; rm *2; hg commit -qAm '4 p2' $ hg merge -qr 3; echo f > u1; echo f > u2; rm -f c1 c2 $ hg commit -qAm '5 merge with two gcas' $ hg log -r . -T '{files}\n' # expecting u1 u2 $ cd ../ $ rm -rf repo