On Sep 16 2015, Nikolaus Rath <nikol...@rath.org> wrote: > On Sep 16 2015, "R. David Murray" <rdmur...@bitdance.com> wrote: >> On Wed, 16 Sep 2015 09:17:38 -0700, Nikolaus Rath <nikol...@rath.org> wrote: >>> On Sep 16 2015, "R. David Murray" <rdmur...@bitdance.com> wrote: >>> > The DAG plus git branches-as-labels *fits in my head* in a way that the >>> > DAG plus named-branches-and-other-things does not. >>> >>> Hmm, that's odd. As far as I know, the difference between the hg and git >>> DAG model can be summarized like this: >>> >>> * In git, leaves of the DAG must be assigned a name. If they don't have >>> a name, they will be garbage collected. If they have a name, they are >>> called a branch. >>> >>> * In hg, leaves of the DAG persist. If you want to remove them, you >>> have to do so explicitly (hg strip), if you want them to have a name, >>> you must do so explicitly (hg bookmark). A node of the DAG with a >>> name is called a bookmark. >>> >>> * hg named branches have no equivalent in git. >>> >>> Does that help? >> >> Well, that last bullet kind of complicates the model, doesn't it? :) > > Not if you come from git and want to use hg. You can just ignore > bookmarks.
Obviously, that should have read "..you can just ignore named branches". Best, -Nikolaus -- GPG encrypted emails preferred. Key id: 0xD113FCAC3C4E599F Fingerprint: ED31 791B 2C5C 1613 AF38 8B8A D113 FCAC 3C4E 599F »Time flies like an arrow, fruit flies like a Banana.« _______________________________________________ Python-Dev mailing list Python-Dev@python.org https://mail.python.org/mailman/listinfo/python-dev Unsubscribe: https://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com