[IPython-dev] Bzr merge idiosyncracies...

Ville M. Vainio vivainio at gmail.com
Wed Jun 4 07:43:31 EDT 2008

On Wed, Jun 4, 2008 at 10:02 AM, Fernando Perez <fperez.net at gmail.com> wrote:

> It would be really good if you put some of these 'bzr good workflow
> practices' in the wiki dev guidelines page.  Feel free to make it all

I'll try to do that soon, but I'm rather bogged ATM.

> The single commit per bugfix is probably also a good policy because
> I'm starting to get the feel that there's ONE file that is going to
> give us grief: the linear ChangeLog.  That's the one file where
> conflicts are likely to appear if we all edit it, so we might be
> better off probably NOT using it anymore, and relying on the commit
> logs instead.  But for that to be viable, the commit logs must be a
> suitable replacement of the current Changelog, so they need to have an
> entry per actual change, and must be more than one-liners.  Otherwise
> there will be no easily human-readable log later anywhere.  Does that
> sound right?

It worked well for us (we used perforce which had similar branch/merge
philosophy), let's try to follow it.

Ville M. Vainio - vivainio.googlepages.com
blog=360.yahoo.com/villevainio - g[mail | talk]='vivainio'

More information about the IPython-dev mailing list