[IPython-dev] Bazaar on OS X
Tue Jun 24 18:03:46 CDT 2008
On Tue, Jun 24, 2008 at 3:47 PM, Brian Granger <firstname.lastname@example.org> wrote:
>> Bummer! Please keep us posted.
>> I have to say that I've given up on the whole 'history folding'
>> problem, so I'm not 100% happy with bzr/lp either. Basically if you
>> have truly diverged lines of work where you did work and committed
>> locally while other devs pushed, a merge is inevitable (even if you
>> keep several branches and push only from one that you don't develop
>> in). And at that point, bzr does the whole 'dropped revisions' dance
>> and folds history.
>> But on the whole we do gain from the ability to flexibly merge (even
>> with ugly history) and the support for contributors from launchpad is
>> vastly better than manually managing accounts on scipy.org and playing
>> admin-by-night, so it's a net gain. Just not a perfect one :)
> Definitely not perfect, but I do agree that it is a net gain from
> before. I would characterize this in the "Just Works" category, but
> with a "Not always quite the way you want it to" clause. Judging from
> past experience (CVS-> SVN->bzr) these decisions are likely not final
> for all eternity.
I agree that it's not perfect, but much better than before. Progress
is always a bumpy road, and as Brian says, we can always choose to go
through this again in the future :)
>> But definitely keep us posted on the nature of the OSX issues.
>> IPython-dev mailing list
More information about the IPython-dev