Re: VC and bzr.

[Óscar Fuentes]

Eli Zaretskii <address@hidden> writes:

>> Both `bzr log' and `git log --first-parent' are screwed by the workflow
>> 
>> merge from trunk into my feature branch
>> then, push to trunk
>
> Unless you work on a feature for a very long time (months), there
> should be no reasons for the "merge from trunk" part.

Merging from trunk into a feature branch is not a serious problem (it
creates some noise on the history with the associated slowdown on bzr's
responsiveness, but that's all). But pushing to trunk after merging is a
serious problem as you (Eli) discovered:

http://thread.gmane.org/gmane.emacs.devel/120336/

See the output of

bzr log -r 99379 -n0

and notice how revisions that once resided on the leftmost part of the
DAG now appear on `trunk' as if they were merged by revision 99379.

[snip]

> Perhaps we should modify the instructions on the wiki slightly, to
> make the workflow slightly less annoying due to frequent slow commits
> and at the same time avoid screwing up what "bzr log" shows on the
> mainline.

The last part is fixed: the Emacs repo will reject operations that lead
to "bzr log" breakage.

The solution for the annoying slowness of commit operations is the smart
server, and if that doesn't reduce the required time to something
reasonable, the Bazaar people have the means for fixing the
problem.