Mercurial > hg-stable
changeset 29766:b303b3817d0e
fakemergerecord: take wlock to write the merge state
The merge state is supposed to be covered by the wlock. We fix the test
extensions to comply to that.
| author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
|---|---|
| date | Mon, 08 Aug 2016 17:33:45 +0200 |
| parents | e93408080646 |
| children | b37f65b047c7 |
| files | tests/fakemergerecord.py |
| diffstat | 1 files changed, 8 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/fakemergerecord.py Sun Aug 07 17:10:47 2016 +0200 +++ b/tests/fakemergerecord.py Mon Aug 08 17:33:45 2016 +0200 @@ -16,10 +16,11 @@ [('X', 'mandatory', None, 'add a fake mandatory record'), ('x', 'advisory', None, 'add a fake advisory record')], '') def fakemergerecord(ui, repo, *pats, **opts): - ms = merge.mergestate.read(repo) - records = ms._makerecords() - if opts.get('mandatory'): - records.append(('X', 'mandatory record')) - if opts.get('advisory'): - records.append(('x', 'advisory record')) - ms._writerecords(records) + with repo.wlock(): + ms = merge.mergestate.read(repo) + records = ms._makerecords() + if opts.get('mandatory'): + records.append(('X', 'mandatory record')) + if opts.get('advisory'): + records.append(('x', 'advisory record')) + ms._writerecords(records)