On Sat, Mar 19, 2011 at 12:59 PM, Raymond Hettinger <raymond.hettin...@gmail.com> wrote: > On Mar 19, 2011, at 11:21 AM, Antoine Pitrou wrote: >> On Sat, 19 Mar 2011 09:25:07 -0500 >> s...@pobox.com wrote: >> >>> The dev guide says something about collapsing changesets. Is that >>> collapsing commits within a changeset or collapsing multiple changesets >>> (whatever that might be)? Do I need this for a trivial change? Can I just >>> push at this point? Once pushed, how does it get merged into the main >>> codebase? >> >> Sincerely, I would really recommend that you read a Mercurial tutorial. >> We could answer all your questions one by one but that wouldn't help you >> much if you don't understand the concepts. > > Skip is not alone on this one. I've been using Mercurial for a couple of > months now, have read multiple tutorials and whatnot, but am still not clear > on how to follow the devguide's suggested cross-branch workflow. > > The dance of pulling, merging, reverting, collapsing, resolving, null > merging, and rebasing cross-linked branches is somewhat more involved and > complex than covered in any of the tutorials I've seen.
I think this will always be the case until someone develops a wiki-type code revision system along with a voting model. The most reliable and highest ranking code would be a nucleus whereupon all other revisions from other collaborators would revolve. Links between the revisions and the core would have "acceptance" requirements. All would be organized around this circular nucleus rather than attempt linearity (which not only requires a benevolent dictator, but that everyone agree so that forks do not create factions -- or worse, abandonment). That being said, it would be a radical adjustment to development style as there would no longer be a "canonical" or MAIN authority. But whatever, wanna help me built it? Marcos, pangaia.sf.net _______________________________________________ Python-Dev mailing list Python-Dev@python.org http://mail.python.org/mailman/listinfo/python-dev Unsubscribe: http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com
