-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 08/13/2010 08:18 PM, me22 wrote: >> Suppose that you have two branches, "master" and "stdenv". As usual, you >> merge master->stdenv every day or two and you merge stdenv->master every >> month or two. Then it is not possible to search for commits that first >> appeared in stdenv. > Who is "you" in this example? It it possible to talk about "the" > stdenv branch in a DVCS? What happens if the commit first appeared in
It is what people intended to commit as "stdenv" branch. The social process is to keep multiple stdenv heads easy-to-merge - and just merged. > the third branch, and was merged into master and stdenv separately, > which were then merged? It is a commit intended to be _committed_ and was committed as commits in the third branch. Simple as that. > I don't know how even as a human I'd decide what came from where in a > history like this: > > a b c > \ / \ / > d e > |\ /| > f X g > |/ \| > h i > \ / > j What branches for commits h and i best reflect developers' intent about what part of parallel development they belong to? Storing branches is just storing the general intent/direction/whatever in a way convenient for searching. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.15 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iQEcBAEBAgAGBQJMZaeCAAoJEE6tnN0aWvw32NUH/2KWQZtrAx9madLQIk/u0Qnq vKyJJOWN3Lkm/r2DUaPxrdBRBAK8zY2Xs33rdIPk6DMHSXVH/m6SDPMYHDzdePYO /M9zMptMlh4TKGsiPGj7gdsqypUrmo1lPKyscRFsUeebWXrwq8f13jZ2YP7OPUE5 T38u77dXelJn6ePAUc4KZxYIFifog0HWUI/iRZ7s84J23MRZ4G5me3fJbFX8k46I J/yc2FxoE4wKDW66U0Uo/KOOJr94mcXRW2fcMczMTrC0ipX9x6XM9UIYh6dSmI7H qgYutbrap2fx7hDeReITcLCsltOzzfux17W6qcAnCjhAFp4vE0aOnRoeQQxioPI= =PzzM -----END PGP SIGNATURE----- _______________________________________________ nix-dev mailing list [email protected] https://mail.cs.uu.nl/mailman/listinfo/nix-dev
