Julian Foad wrote:
> On Tue, 2008-10-21 at 10:54 +0200, Stephen Butler wrote:
>> Quoting "Neels J. Hofmeyr" <neels_at_elego.de>:
>> Sorry for screaming so late. I have a diff that does both of these, plus
NP, I was "taking" stuff last thing last night, so you guys had time to
scream this morning. All is well.
>> the notifications in the 4th item below. I'll send it in a bit, though
>> it's still rough.
> That's great.
>> On second thought, first I'll split it into separate status and notify
>> diffs. They have less common code than I thought they would. Though
>> it's weird to have intermediate states where expected_output and
>> expected_status are inconsistent.
>>>> * There must be a way to use "svn merge" to merge a required change
>>>> into a WC to resolve a tree conflict. (The merge currently fails if
>>>> there is any conflict already flagged, which is usually the desired
>>>> behaviour, but not when you're trying to resolve a conflict and need to
>>>> use a merge.)
> OK, I'll take this one.
>>>> * Notifications from "update", "switch", "merge" need to show "C" on
>>>> the victim in a new column, rather than "C" on the parent in the first
Right, then, taking this one :)
And after that, If there aren't other things floating, I'll continue
refactoring diff beyond recognition. I'll have to change the diff callbacks
signatures, so that directory addition and prop changes can go together.
Actually it would be pretty nice to still have this API change in 1.6.
Should I hurry? When is 1.6 going to be branched?
"December 2008 Roll 1.6.0 tarball"
Does that mean December 2008 is the point at which things that go in 1.6
need to be finished, or 8 weeks prior to that?
Neels Hofmeyr -- elego Software Solutions GmbH
Gustav-Meyer-Allee 25 / Gebäude 12, 13355 Berlin, Germany
phone: +49 30 23458696 mobile: +49 177 2345869 fax: +49 30 23458695
http://www.elegosoft.com | Geschäftsführer: Olaf Wagner | Sitz: Berlin
Handelsreg: Amtsgericht Charlottenburg HRB 77719 | USt-IdNr: DE163214194
Received on 2008-10-21 15:42:05 CEST