Mercurial > hg
view tests/bundles/rebase.sh @ 50242:379a78001d8e stable
dirstate: set identity whenever we read the dirstate's v2 docket
The docket can be loaded outside of a full read (for exemple when
pre-fetching parents), so the current code would read/set the identity
after loading the data, opening a race condition:
A0: first process docket is read
B0: other process appends new data to the dirstate (and changes the docket)
A1: first process sets the identity (based on pre-B content, but with post-B identity)
A1: first process loads the dirstatemap from the data file
A1: first process does not detect the race and overwrites the update from B.
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Wed, 01 Mar 2023 02:38:20 +0100 |
parents | 5d57b2101ab1 |
children |
line wrap: on
line source
#!/usr/bin/env bash hg init rebase cd rebase # @ 7: 'H' # | # | o 6: 'G' # |/| # o | 5: 'F' # | | # | o 4: 'E' # |/ # | o 3: 'D' # | | # | o 2: 'C' # | | # | o 1: 'B' # |/ # o 0: 'A' echo A > A hg ci -Am A echo B > B hg ci -Am B echo C > C hg ci -Am C echo D > D hg ci -Am D hg up -q -C 0 echo E > E hg ci -Am E hg up -q -C 0 echo F > F hg ci -Am F hg merge -r 4 hg ci -m G hg up -q -C 5 echo H > H hg ci -Am H hg bundle -a ../rebase.hg cd .. rm -Rf rebase