[IPython-dev] [Branch ~ipython/ipython/trunk] Rev 1012: Merging edits to development.txt

[Fernando Perez]

Hey guys,

we're still getting this 'folding' problem it seems.  I think with
true merges we can't avoid it, but I thought if we all used pull on
our local copy of the trunk we could minimize it, no?  That's what I
was trying to use (bzr pull instead of bzr merge) and it seemed to be
working...

No big deal, but I'd like to keep our log linear when the underlying
development was indeed linear (as this little change was).  Let's see
if the pull approach works better.

Anyway, I'm offline now again...

Cheers,

f

On Thu, Jun 12, 2008 at 1:47 PM,  <noreply at launchpad.net> wrote:
> ------------------------------------------------------------
> revno: 1012
> committer: Brian E Granger <ellisonbg at gmail.com>
> branch nick: ipython
> timestamp: Thu 2008-06-12 14:46:16 -0600
> message:
>  Merging edits to development.txt
> modified:
>  docs/source/development/development.txt
>    ------------------------------------------------------------
>    revno: 1010.1.1
>    committer: Fernando Perez <Fernando.Perez at berkeley.edu>
>    branch nick: trunk-dev
>    timestamp: Thu 2008-06-12 13:39:18 -0700
>    message:
>      Update dev guide with commit message guidelines
>    modified:
>      docs/source/development/development.txt
>
> === modified file 'docs/source/development/development.txt'
> --- a/docs/source/development/development.txt   2008-06-12 19:44:12 +0000
> +++ b/docs/source/development/development.txt   2008-06-12 20:39:18 +0000
> @@ -137,6 +137,22 @@
>        $ ...do work in ipython-mybranch...
>        $ bzr ci -m "the commit message goes here"
>
> +Please note that since we now don't use an old-style linear ChangeLog
> +(that tends to cause problems with distributed version control
> +systems), you should ensure that your log messages are reasonably
> +detailed.  Use a docstring-like approach in the commit messages
> +(including the second line being left *blank*)::
> +
> +  Single line summary of  changes being committed.
> +
> +  - more details when warranted ...
> +  - including crediting outside contributors if they sent the
> +    code/bug/idea!
> +
> +If we couple this with a policy of making single commits for each
> +reasonably atomic change, the bzr log should give an excellent view of
> +the project, and the `--short` log option becomes a nice summary.
> +
>  While working with this branch, it is a good idea to merge in changes that have been
>  made upstream in the parent branch.  This can be done by doing::
>
>
>
>
> --
> Main line of IPython development (stable)
> https://code.launchpad.net/~ipython/ipython/trunk
>
> You are receiving this branch notification because you are subscribed to it.
> To unsubscribe from this branch go to https://code.launchpad.net/~ipython/ipython/trunk/+edit-subscription.
>