Re: trunk r115472: Make 'configure' work out-of-the-box on Solaris.

[Eli Zaretskii]

> Date: Sat, 14 Dec 2013 12:23:05 +0100
> From: martin rudalics <address@hidden>
> CC: address@hidden, address@hidden, address@hidden
> 
>  > But I disagree with Stephen about the PITA part: normally, when I make
>  > a different build, I do that because I need to debug it or test some
>  > changes specific to that build.  Having a separate branch for that
>  > from the get-go makes it very easy to make changes without thinking
>  > twice, and also to merge those changes later onto the trunk.
> 
> The problem with a separate branch is that I continuously have to
> resolve conflicts, sometimes over a longer period.  I currently do that
> for four branches already and it's getting tedious.

If you have the same changes in each of the branches, then indeed
separate build directories is what you want.