Stuff Michael Meeks is doing |
Older items: 2023: ( J F M A M J ), 2022: ( J F M A M J J A S O N D ), 2021, 2019, 2018, 2017, 2016, 2015, 2014, 2013, 2012, 2011, 2010, 2009, 2009, 2008, 2007, 2006, 2005, 2004, 2003, 2002, 2001, 2000, 1999, legacy html
git rebase
can do it it must be possible. It also
sucks beyond belief to have five RCS' on the go at once: svn, git,
bzr, hg, and (by far the most retarded) 'osc' - sometimes I try a
couple before I hit the right command to update - perhaps some
monster wrapper to detect & select the right sub-set of a few
commands that I care about would help(?). Perhaps the most annoying
thing about these newfangled systems, is that the simple flow of:foo checkout baa cd baa while (1) { < ... hack some stuff ... > foo update } foo diff > /tmp/patch-for-some-guy.diffso beloved of cvs, svn users no longer really works; instead DRCS people, for reasons best known to themselves, seem to love to force you to branch and commit before merging; thus demanding that you read the manual, understand the cryptic 'treeish', get acquainted with
HEAD^1
and other such things; when
all you wanted to do was just re-base your scratch copy vs. the
latest code. To this idea git says:error: Entry 'Makefile' not uptodate. Cannot merge.And bzr's man-page seems to want a commit to complete the update.
My content in this blog and associated images / data under
images/
and data/
directories are (usually)
created by me and (unless obviously labelled otherwise) are licensed under
the public domain, and/or if that doesn't float your boat a CC0
license. I encourage linking back (of course) to help people decide for
themselves, in context, in the battle for ideas, and I love fixes /
improvements / corrections by private mail.
In case it's not painfully obvious: the reflections reflected here are my own; mine, all mine ! and don't reflect the views of Collabora, SUSE, Novell, The Document Foundation, Spaghetti Hurlers (International), or anyone else. It's also important to realise that I'm not in on the Swedish Conspiracy. Occasionally people ask for formal photos for conferences or fun.
Michael Meeks (michael.meeks@collabora.com)