Pushing after merge considered harmful

Óscar Fuentes ofv at wanadoo.es
Sun Feb 28 20:44:05 GMT 2010


Eli Zaretskii <eliz at gnu.org> writes:

[snip]

> That's it!  Let me know if you like the results:

Well, I'll let you know my impressions even if I don't fully like the
results :-)

> --------------------------------------------------------------------
> ==========================
> The History and the Bazaar
> ==========================
>
> .. warning::
>
>     This is advanced documentation of the Bazaar version control system and
>     its underlying conceptual model.  It is not intended as a first
>     introduction to the system.  However, it can provide a deeper level of
>     understanding of the structures that underlie it and thus it may be
>     helpful once you are familiar with using Bazaar for version control.

This reminds me of John Wiegley's great "Git from bottom up"

http://www.newartisans.com/blog_files/git.from.bottom.up.php

> Bazaar's History Representation
> ===============================
>
> Bazaar is a `distributed version control system` (DVCS) and like all
> such systems, it makes it very easy to fork development off the
> `official` series of revisions, known as the `mainline`, and later
> combine the forked-off revision with mainline.  We call the forked-off
> revision a `branch` and the process of combining a branch with mainline
> a `merge`.



More information about the bazaar mailing list