[dmd-beta] 2.065 Final Release Prep

[Andrew Edwards]

On 2/24/14, 1:54 AM, Daniel Murphy wrote:
> I don't think merging back into master is feasible at this point.  We 
> have been merging fixes to master first, then cherry-picking/rebasing 
> them to the release branch, and I don't think a merge to master is 
> necessary or desirable with this model.
>
>
> On Mon, Feb 24, 2014 at 5:46 PM, Andrew Edwards <edwards.ac at gmail.com 
> <mailto:edwards.ac at gmail.com>> wrote:
>
>
>     Merger of all branches with master were successfull with exception
>     of DMD and PHOBOS.
>
>     Following are the conflicts that will be encountered for DMD:
>         seireitei:dmd ace$ git merge 2.065
>         Auto-merging test/runnable/xtest46.d
>         CONFLICT (content): Merge conflict in test/runnable/xtest46.d
>         Auto-merging test/runnable/aliasthis.d
>         CONFLICT (content): Merge conflict in test/runnable/aliasthis.d
>         Auto-merging src/typinf.c
>         CONFLICT (content): Merge conflict in src/typinf.c
>         Auto-merging src/traits.c
>         CONFLICT (content): Merge conflict in src/traits.c
>         Auto-merging src/template.h
>         Auto-merging src/template.c
>         CONFLICT (content): Merge conflict in src/template.c
>         Auto-merging src/struct.c
>         CONFLICT (content): Merge conflict in src/struct.c
>         Auto-merging src/parse.c
>         CONFLICT (content): Merge conflict in src/parse.c
>         Auto-merging src/mtype.h
>         CONFLICT (content): Merge conflict in src/mtype.h
>         Auto-merging src/mtype.c
>         CONFLICT (content): Merge conflict in src/mtype.c
>         Auto-merging src/interpret.c
>         CONFLICT (content): Merge conflict in src/interpret.c
>         Auto-merging src/inline.c
>         CONFLICT (content): Merge conflict in src/inline.c
>         Auto-merging src/glue.c
>         CONFLICT (content): Merge conflict in src/glue.c
>         Auto-merging src/func.c
>         CONFLICT (content): Merge conflict in src/func.c
>         Auto-merging src/expression.h
>         CONFLICT (content): Merge conflict in src/expression.h
>         Auto-merging src/expression.c
>         CONFLICT (content): Merge conflict in src/expression.c
>         Auto-merging src/e2ir.c
>         CONFLICT (content): Merge conflict in src/e2ir.c
>         Auto-merging src/dsymbol.h
>         CONFLICT (content): Merge conflict in src/dsymbol.h
>         Auto-merging src/doc.c
>         CONFLICT (content): Merge conflict in src/doc.c
>         Auto-merging src/declaration.h
>         CONFLICT (content): Merge conflict in src/declaration.h
>         Auto-merging src/ctfeexpr.c
>         CONFLICT (content): Merge conflict in src/ctfeexpr.c
>         Auto-merging src/cast.c
>         Auto-merging src/attrib.c
>         CONFLICT (content): Merge conflict in src/attrib.c
>         Automatic merge failed; fix conflicts and then commit the result.
>
>     Following are the conflicts that will be encountered for PHOBOS:
>         seireitei:phobos ace$ git merge 2.065
>         Auto-merging std/traits.d
>         CONFLICT (content): Merge conflict in std/traits.d
>         Auto-merging std/algorithm.d
>         CONFLICT (content): Merge conflict in std/algorithm.d
>         Automatic merge failed; fix conflicts and then commit the result.
>
>     I have aborted these mergers so am not yet sure what the actual
>     conflicts are or how time-consuming resolution will be.
>

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.puremagic.com/pipermail/dmd-beta/attachments/20140225/2bcd35b8/attachment-0001.html>