[IPython-dev] Hum... tried to merge gael branch...

[Laurent Dufréchou]

Yeah! This is what I've just seen :)
In fact i think only the chmod +x has changed I think...

If I merge with trunk, then I need to commit back to my branch. Does
it will have some side effect when merging back my branch????

For example can I safely do:
bzr merge ipython main branch +
bzr merge gael branch

and than later merge my code into main one?

If that works, wow bzr is good :)!

Sorry for newbiness question, but I don't want to destroy my branch!!!!

2009/2/11 Gael Varoquaux <gael.varoquaux at normalesup.org>:
> On Wed, Feb 11, 2009 at 10:39:20PM +0100, Laurent Dufréchou wrote:
>> Hum for just get about the def Main... I've modified my code recently that
>> make the script die...
>> Will correct this. In fact I think the script has only be renamed!
>> shame on me :)
>
> And in addition this has not happened in my branch, but in the main one
> (trunk), and I only got the change by syncing with the trunk. You can
> check this by doing 'bzr log ipython-wx'.
>
> You should sync to the trunk every once in a while, it would make your
> life easier tracking what happens.
>
> Cheers,
>
> Gaël
> _______________________________________________
> IPython-dev mailing list
> IPython-dev at scipy.org
> http://lists.ipython.scipy.org/mailman/listinfo/ipython-dev
>