[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Monotone-devel] boost 1.53 breaks monotone build
From: |
Stephen Leake |
Subject: |
Re: [Monotone-devel] boost 1.53 breaks monotone build |
Date: |
Tue, 19 Mar 2013 00:11:19 -0400 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.2 (windows-nt) |
Richard Hopkins <address@hidden> writes:
>>
>> On my local machine, resolve_conflicts_dropped_modified_1
>> fails
>> constantly.
> Same here! Glad I'm not the only one; I was seriously starting to doubt
> my hardware, OS, or config, especially as I had it succeed once or twice,
> the backtrace kept changing, and that it hasn't failed yet on Windows.
In 79e73d6882ea68c70abd5891f47806eabe5d0f10 on 16 March 2013 (3 days
ago), I fixed a bug related to that; there was this snippet of code in
merge_content.cc:
else
{
parents.erase (i);
set<revision_id> more_parents;
db.get_revision_parents(*i, more_parents);
parents.insert(more_parents.begin(), more_parents.end());
}
This has *i after erase (i), which can have random effects depending on
the stack/heap content.
It is now:
else
{
set<revision_id> more_parents;
db.get_revision_parents(*i, more_parents);
parents.erase (i);
parents.insert(more_parents.begin(), more_parents.end());
}
This fixed a hang on Windows for me.
Let me know if it fixes your problems.
--
-- Stephe
- [Monotone-devel] boost 1.53 breaks monotone build, Richard Hopkins, 2013/03/14
- Re: [Monotone-devel] boost 1.53 breaks monotone build, Markus Wanner, 2013/03/15
- Re: [Monotone-devel] boost 1.53 breaks monotone build, Richard Hopkins, 2013/03/15
- Re: [Monotone-devel] boost 1.53 breaks monotone build, Hendrik Boom, 2013/03/16
- Re: [Monotone-devel] boost 1.53 breaks monotone build, Markus Wanner, 2013/03/18
- Re: [Monotone-devel] boost 1.53 breaks monotone build, Richard Hopkins, 2013/03/18
- Re: [Monotone-devel] boost 1.53 breaks monotone build,
Stephen Leake <=
- Re: [Monotone-devel] boost 1.53 breaks monotone build, Markus Wanner, 2013/03/19
- Re: [Monotone-devel] boost 1.53 breaks monotone build, Stephen Leake, 2013/03/19
- Re: [Monotone-devel] boost 1.53 breaks monotone build, Frédéric Praca, 2013/03/19
- Re: [Monotone-devel] boost 1.53 breaks monotone build, Richard Hopkins, 2013/03/19