[phobos] phobos commit, revision 2336

Brad Roberts braddr at puremagic.com
Sat Jan 15 19:48:52 PST 2011


Hard to say, other than failing to review "svn diff" before submitting after
resolving the conflicts.  I'd suggest that 'mine-conflicts' is risky, but I
don't have that much experience with svn conflict resolution.  I _always_ select
the (e)dit option and examine the changes closely.

On 1/15/2011 7:36 PM, Andrei Alexandrescu wrote:
> I hoped I did nothing related. I updated, got conflict, chose "mine conflicts",
> oddly nothing conflicted, rand a build for checking, and committed. What did I
> do wrong?
> 
> Anyway... sent out a patch.
> 
> Andrei
> 
> On 1/15/11 9:21 PM, Brad Roberts wrote:
>> On 1/15/2011 7:08 PM, dsource.org wrote:
>>> phobos commit, revision 2336
>>>
>>>
>>> user: andrei
>>>
>>> msg:
>>> Put binaries in different dirs depending on MODEL
>>>
>>> http://www.dsource.org/projects/phobos/changeset/2336
>>>
>>> paths changed:
>>> U   trunk/phobos/posix.mak
>>
>> Did those 64 bit tests really start failing again or did you regress that part
>> of the make file?
>>
>>
>>
>> _______________________________________________
>> phobos mailing list
>> phobos at puremagic.com
>> http://lists.puremagic.com/mailman/listinfo/phobos
> _______________________________________________
> phobos mailing list
> phobos at puremagic.com
> http://lists.puremagic.com/mailman/listinfo/phobos



More information about the phobos mailing list