4 ms·
I really recommend that this be a companion piece to Linus Torvald's own advice, here: People can (and probably should) rebase their _private_ trees (their o
by chris_wot 14y ago
I really recommend that this be a companion piece to Linus Torvald's own advice, here:
People can (and probably should) rebase their _private_ trees (their own
work). That's a _cleanup_. But never other peoples code.
That's a "destroy history"
http://www.mail-archive.com/dri-devel@lists.sourceforge.net/msg39091.html http://www.mail-archive.com/dri-devel@lists.sourceforge.net/...
He then gives specific advice.
- deleted 14y ago[deleted]
- deleted 14y ago[deleted]
- deleted 14y ago[deleted]
- deleted 14y ago[deleted]
- beaumartinez 14y agoHonestly, this type of pedantry is pointless. We all understood what he meant. English is an evolving language, and many of the things that are "correct" today were similarly "incorrect" yesterday.
- deleted 14y ago[deleted]
- deleted 14y ago[deleted]
- deleted 14y ago[deleted]
- chalst 14y agoQuite. This kind of attachment to the peculiarities of Standard English rarely matters outside highly formal settings - it is as much an enemy of effective communication as its servant. Example of advise used as a noun, a snowclone most of us have probably encountered: An X's advise to his/her Y (based on the eponymously authored 1811 "Lord Chesterfield's Advise to His Son"), which loses its impact in print if you don't use the not-very-archaic spelling.
- deleted 14y ago[deleted]
- why-el 14y agoPlease keep your comments in place, especially when you receive feedback. If you couldn't contact the person you were trying to give advice to, I suggest you write a post about it rather than inject a piece of text only to delete it an hour later. Your original aim of not cluttering the thread is, well, not that apparent now.
- deleted 14y ago[deleted]
- deleted 14y ago[deleted]
- tonfa 14y agoEvolve for Mercurial (starting to show up in core mercurial) is trying to cleanly solve this. It provides (safe) mutable history for local changes (the VCS tracks what is safe and what isn't), and a way to still be able to collaborate on changes without "surprising" the people who pull from you. E.g.: http://draketo.de/light/english/mercurial/hg-evolve-2013-01-12 http://draketo.de/light/english/mercurial/hg-evolve-2013-01-...
- porker 14y agoThat's a very nice idea.
- limmeau 14y agoIs that an executable doctest?
- tonfa 14y agoWhat do you mean? The post is showing a session using the evolve extension (extension available from an external repo). The extension is experimental, and I'm not sure how many guarantees are given wrt stability (probably best effort). Now the extension is in the process of getting moved into core (where the behaviour, protocol, file formats will be frozen).
- limmeau 14y agoI was referring to Python doctests (documentation narrative with interspersed Python statements and embedded reference output). The text looked to me like one could extract all the commands, run them and check their output against the embedded reference output automatically. I don't know, it had such a rigid structure. On a second look, the output contains timestamps, so what looks like shell output is probably only shell output the author has copied once into their text.
- aardvark179 14y agoThat looks fantastic, I like the idea of mutable local history while guarding against history editing problems.
- deleted 14y ago[deleted]
- achiang 14y agoExactly. The kernel community has lots of wisdom built up around rebase vs. merge, and the way I think about it is, imagine a tree of developers with Linus at the top, maintainers in the middle, and leaf nodes at the bottom. - leaf nodes can and should rebase to ensure whatever they submit is "bisect clean" - everyone else should never rebase because you'll destroy history As a leaf node, you should always be committing and submitting the cleanest patches possible. The prime directive is "do not break bisect". There's much more wisdom in: http://www.kernel.org/doc/Documentation/SubmittingPatches http://www.kernel.org/doc/Documentation/SubmittingPatches stgit is a nice tool to manage your patches as a leaf node. It lets you go back and clean up individual patches in your history so that everything you submit is clean. Maintainers don't rebase, period. And recently (past 18 months or so), Linus has been yelling at them to not merge from mainline back into their proposed branch before pull request. The rationale is that when you do so, your pull request is now based on untested code. Most dev communities will never scale as large as lkml, so not all the lkml conventions make perfect sense to adopt. However, like I said, there is still a lot to be learned from the community that's been using git the longest and pushing it the hardest.