On Mar 25, 2010, at 11:51 AM, Dave wrote:
> Hi All,
>
> Regarding:
>
> On 24 Mar 2010, at 06:05, Eli Bach wrote:
>>
>> And if you don't have your code in a version control system that supports
>> branching [and no, CVS does NOT count], you go to your bedroom and think
>> about that while I g
Hi All,
Regarding:
On 24 Mar 2010, at 06:05, Eli Bach wrote:
And if you don't have your code in a version control system that
supports branching [and no, CVS does NOT count], you go to your
bedroom and think about that while I go and make a switch to punish
you with. If you're a one or
On Thu, 25 Mar 2010 12:38:10 -0500, Ken Thomases said:
>The problem isn't so much the file format, it's Interface Builder. IB
>is too prone to renumbering/reordering objects or implementing a simple
>property change as removal of the object and replacement with a new object.
Exactly. Try this:
On Mar 25, 2010, at 12:23 PM, davel...@mac.com wrote:
> On Mar 25, 2010, at 11:12 AM, Sean McBride wrote:
>
>> That's all fine and good until you need to change a xib (or worse,
>> nib). xibs are neither diffable nor auto-mergeable. In my experience,
>> they are the single biggest PITA when try
On Mar 25, 2010, at 11:12 AM, Sean McBride wrote:
> On Wed, 24 Mar 2010 16:48:49 -0700, Dave Carrigan said:
>
>> Create a branch for your feature, do all the work on that branch, then
>> merge it to the trunk when it's ready. Put your released product in a
>> different branch and do your bugfixe
On Wed, 24 Mar 2010 16:48:49 -0700, Dave Carrigan said:
>Create a branch for your feature, do all the work on that branch, then
>merge it to the trunk when it's ready. Put your released product in a
>different branch and do your bugfixes on that branch and merge them to
>trunk. Don't work on trunk
On Wed, Mar 24, 2010 at 5:10 PM, Jon Pugh wrote:
> Not to start the inevitable version control flamewar, but Subversion's
> branching is weak in comparison to other systems, except cvs of course.
> Perforce has strong branching and merging also.
Agreed. I recently had to merge a feature branch
At 4:48 PM -0700 3/24/10, Dave Carrigan wrote:
>Actually, a subversion branch is exactly what you want.
Not to start the inevitable version control flamewar, but Subversion's
branching is weak in comparison to other systems, except cvs of course.
Perforce has strong branching and merging also.
On Mar 24, 2010, at 4:35 PM, Graham Cox wrote:
> Thanks Eli (and Mike too, who voiced much the same opinion). I guess the term
> 'fork' in my title was a bit misleading. The change isn't that radical.
> Basically I want to add a major new feature but in the meantime make it
> possible to relea
On 24/03/2010, at 5:05 PM, Eli Bach wrote:
> I can only suggest with the utmost conviction that you actually fork the code
> base, [as in, have completely separate 'bug fix' and 'radical change'
> branches]. Either your radical changes will leak into your bug fix version,
> or you won't be ab
On Mar 23, 2010, at 6:48 PM, Graham Cox wrote:
> I'm having a problem making settings in a new target apply in my code. I'm
> sure this is really simple and I'm missing something obvious.
>
> The point is to permit me to release bugfixes to my existing codebase while
> moving it forward in a m
On Tue, Mar 23, 2010 at 8:48 PM, Graham Cox wrote:
> I'm having a problem making settings in a new target apply in my code. I'm
> sure this is really simple and I'm missing something obvious.
>
> The point is to permit me to release bugfixes to my existing codebase while
> moving it forward in a
On 24/03/2010, at 12:43 PM, Greg Parker wrote:
> In Xcode, you don't want a "User-Defined Setting". Try manipulating the
> "Preprocessor Macros" setting instead.
Ah, thank-you, that works no problem.
On a related note, is there a simple way to conditionalise parts of nibs?
Specifically, I h
On 23 Mar 2010, at 7:48 PM, Graham Cox wrote:
> I'm having a problem making settings in a new target apply in my code. I'm
> sure this is really simple and I'm missing something obvious.
>
> The point is to permit me to release bugfixes to my existing codebase while
> moving it forward in a mor
On Mar 23, 2010, at 5:48 PM, Graham Cox wrote:
> I'm having a problem making settings in a new target apply in my code. I'm
> sure this is really simple and I'm missing something obvious.
>
> The point is to permit me to release bugfixes to my existing codebase while
> moving it forward in a mor
I'm having a problem making settings in a new target apply in my code. I'm sure
this is really simple and I'm missing something obvious.
The point is to permit me to release bugfixes to my existing codebase while
moving it forward in a more radical way for future versions. I duplicated my
exist
16 matches
Mail list logo