Mercurial > hg
diff tests/test-bookmarks-corner-case.t @ 42682:e0cf09bc35ef stable
bookmarks: actual fix for race condition deleting bookmark
This is a simple but efficient fix to prevent the issue tested in
`test-bookmarks-corner-case.t`. It might be worth pursuing a more generic
approach where filecache learn to depend on each other, but that would not be
suitable for stable.
The issue is complicated enough that I documented the race and its current
solution as inline comment. See this comment for details on the fix.
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Fri, 21 Jun 2019 03:50:40 +0200 |
parents | 811e502d646d |
children | 863e9e7f8850 |
line wrap: on
line diff
--- a/tests/test-bookmarks-corner-case.t Thu Aug 01 16:22:47 2019 +0200 +++ b/tests/test-bookmarks-corner-case.t Fri Jun 21 03:50:40 2019 +0200 @@ -200,6 +200,7 @@ $ cat push-output.txt pushing to ssh://user@dummy/bookrace-server searching for changes + remote has heads on branch 'default' that are not known locally: f26c3b5167d1 remote: setting raced push up remote: adding changesets remote: adding manifests @@ -219,7 +220,7 @@ | summary: A1 | | o changeset: 3:f26c3b5167d1 - | | bookmark: book-B (false !) + | | bookmark: book-B | | user: test | | date: Thu Jan 01 00:00:00 1970 +0000 | | summary: B1 @@ -242,4 +243,4 @@ $ hg -R bookrace-server book book-A 4:9ce3b28c16de - book-B 3:f26c3b5167d1 (false !) + book-B 3:f26c3b5167d1