[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-devel] Re: Stable version?
From: |
graydon hoare |
Subject: |
[Monotone-devel] Re: Stable version? |
Date: |
Fri, 17 Dec 2004 20:46:15 -0500 |
User-agent: |
Mozilla Thunderbird 0.8 (X11/20040913) |
Peter Simons wrote:
I was wondering: Which version from off.net should I use
nowadays? The main branch has two heads
monotone: branch 'net.venge.monotone' is currently unmerged:
c853237f9d8d155431f88aca12932d2cdaaa31fe address@hidden 2004-12-13T04:14:47
d0d0d124cc9091064008c6728f725662cb8394a4 address@hidden 2004-12-10T22:39:35
and either version creates (unexpected) failures in the test
suite, so I am a bit uncertain what to do. Any advice
anyone?
yeah, phew, this has been a bit of a mess.
we had the following situation:
- there's a bug which causes the occasional line to get deleted during
a merge which njs has been hounding me about (rightly) for a while
- this caused c8532 to drop a "return true;", causing testsuite faults
- emile fixed this with a patch (thanks)
- I fixed the underlying bug which causes the line-droppage, and added
emile's fix, which was really just resurrecting a dropped line. also
un-xfail'd all the related tests.
so rev 68d5d, which is my most recent head (merged with joel and msh's
head), ought to be ok. I'd recommend starting with it (or a descendant)
when doing future merges, since other revs have this line-drop bug. it
actually goes quite a ways back, a few major releases worth, to the last
time I overhauled the line merger. it just hasn't been triggered because
we haven't been doing *that* much merging until recently.
-graydon
- [Monotone-devel] Stable version?, Peter Simons, 2004/12/16
- [Monotone-devel] Re: Stable version?,
graydon hoare <=
- Re: [Monotone-devel] Re: Stable version?, Richard Levitte - VMS Whacker, 2004/12/18
- Re: [Monotone-devel] Re: Stable version?, Richard Levitte - VMS Whacker, 2004/12/18
- Re: [Monotone-devel] Re: Stable version?, Matt Johnston, 2004/12/18
- Re: [Monotone-devel] Re: Stable version?, Richard Levitte - VMS Whacker, 2004/12/18
- Re: [Monotone-devel] Re: Stable version?, Derek Scherger, 2004/12/18
- Re: [Monotone-devel] Re: Stable version?, Nathaniel Smith, 2004/12/18
- Re: [Monotone-devel] Re: Stable version?, Richard Levitte - VMS Whacker, 2004/12/18
- Re: [Monotone-devel] Re: Stable version?, Richard Levitte - VMS Whacker, 2004/12/22
[Monotone-devel] Re: Stable version?, Peter Simons, 2004/12/18
[Monotone-devel] Do .mt-attrs still work? (was: Stable version?), Peter Simons, 2004/12/18