Pushing after merge considered harmful

[Ian Clatworthy]

On 05/04/10 01:37, Eli Zaretskii wrote:

>> I'd like to turn this into a help topic and link it into our
>> documentation under the Concepts section of our User Reference. Perhaps
>> the topic could be called something like conceptual-model or
>> history-graph. Any preference?
>
> history-representation would seem appropriate.

That's fine with me.

>> Could you please submit a merge proposal once you're happy with the
>> document?
>
> Will do, but please tell how would you like me to submit it.  Would
> the diffs against http://bazaar.launchpad.net/~nmb/bzr/dag-docs/ be
> okay?
>

I think it should be against the bzr trunk, lp:bzr.
(https://code.launchpad.net/~bzr-pqm/bzr/bzr.dev)

Ian C.