Presenting a clean history: how to synchronize two repositories.

[Kastner Masilko, Friedrich]

> From: mercurial-bounces at selenic.com [mailto:mercurial-bounces at selenic.com] On Behalf Of Michael McNeil Forbes
> 
> I must be missing your idea: if I create an "abridged" branch and then
> when I merge in changes from the dev branch, the "abridged" branch will
> depend on the dev branches: there is no way of not pushing everything.
> 
> Perhaps you suggest that the "abridged" branch have nothing merged in
> from the dev branches, then I could push as you suggest, but there is
> no information about which changesets in the dev branch correspond to
> which changes in the abridged branch: hence there is no easy way of
> coordinating the flow of information back and forth.
> 
> It seems that at least with convert, there is some sort of mechanism
> for the converted repo to keep track of which changesets each part of
> the converted repository came from.  I am looking for advice on how to
> actually use this information in a sane manner.

Transplant/Graft also do the later by means of implanting the source hash in the extras of the new commit. FWIW, TortoiseHg had a nice feature since a while for displaying that relation as dashed lines in the graph visualization. That said, I could imagine a workflow where you do the "dirty" work in one named branch, including creating sqashed commits. Then you graft over the important changesets to the "clean" branch, taking advantage from the implanted source information to have a loose link. The "clean" branch is what gets pushed only, because it has no parent-relation to merged-in "dirty" commits.

regards,
Fritz



Development Software Systems
Festo Gesellschaft m.b.H.
Linzer Strasse 227
Austria - 1140 Wien

Firmenbuch Wien
FN 38435y
UID: ATU14650108

Tel: +43(1)91075-198
Fax: 
www.festo.at

Der Inhalt dieser E-Mail und moeglicher Anhaenge sind ausschliesslich fuer den bezeichneten Adressaten bestimmt.
Jede Form der Kenntnisnahme, Veroeffentlichung, Vervielfaeltigung oder Weitergabe des Inhalts dieser E-Mail und
moeglicher Anhaenge durch unberechtigte Dritte ist unzulaessig. Wir bitten Sie, sich mit dem Absender der E-Mail in
Verbindung zu setzen, falls Sie nicht der Adressat dieser E-Mail sind sowie das Material von Ihrem Computer zu loeschen.

This e-mail and any attachments are confidential and intended solely for the addressee. The perusal, publication, copying or
dissemination of the contents of this e-mail by unauthorised third parties is prohibited. If you are not the intended recipient of this
e-mail, please delete it and immediately notify the sender.