From 51851d54a512ed94b7e75939eee70c3840b98672 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Mon, 6 Apr 2009 00:29:32 +0200 Subject: [PATCH] Housekeeping on Monday, 6th of April, Anno Domini MMIX, at the hour of the Rat Signed-off-by: Johannes Schindelin --- blog.rss | 48 +++++++++++++++++------------------------------- source-1233706294.txt | 24 ------------------------ 2 files changed, 17 insertions(+), 55 deletions(-) delete mode 100644 source-1233706294.txt diff --git a/blog.rss b/blog.rss index 5939078ad4..ae8b5a3a30 100644 --- a/blog.rss +++ b/blog.rss @@ -5,9 +5,25 @@ http://repo.or.cz/w/git/dscho.git?a=blob_plain;hb=blog;f=index.html A few stories told by Dscho -Sun, 05 Apr 2009 22:54:52 +0200 +Mon, 06 Apr 2009 00:29:32 +0200 en-us +How to recover from a hackathon +http://repo.or.cz/w/git/dscho.git?a=blob_plain;hb=blog;f=index.html#1238970571 +http://repo.or.cz/w/git/dscho.git?a=blob_plain;hb=blog;f=index.html#1238970571 +Mon, 06 Apr 2009 00:29:31 +0200 +

+Phew, 2 crazy and fantastic weeks are behind me. But it takes its toll: +a weekend I was more offline than online. +

+Things that are important now: relax. sleep. take a walk. learn to sleep +more than 4 hours a night again. learn to watch a movie without thinking +about code. go for a run. +

+And after recovering, back to the rebase-i-p branch!]]> + + So, what is missing from my rebase-i-p branch? http://repo.or.cz/w/git/dscho.git?a=blob_plain;hb=blog;f=index.html#1236554268 http://repo.or.cz/w/git/dscho.git?a=blob_plain;hb=blog;f=index.html#1236554268 @@ -325,35 +341,5 @@ requirement of that valgrind version, as it is really, really useful.

I guess we will see what happens to it.]]> - -Problems with split-topic-branches.sh -http://repo.or.cz/w/git/dscho.git?a=blob_plain;hb=blog;f=index.html#1233706294 -http://repo.or.cz/w/git/dscho.git?a=blob_plain;hb=blog;f=index.html#1233706294 -Wed, 04 Feb 2009 01:11:34 +0100 -

-So my little script that should help me to split my topic branches does -not work properly. -

-First some background: the idea was to let git blame do the hard work -to find overlapping changes, i.e. changes that would conflict when -changing the order (or skipping the first change, on which the next builds). -

-The first problem with that approach: when lines are removed by one -commit, and the next commit touches the same location, git blame does -not find that the first commit is required by the second. -

-Therefore I introduced a really slow reverse thing which tries to find -those commits whose removals survived until the parent of a particular -commit, but not further. -

-However, it does not work properly. Basically, only context sizes that -span the whole files lead to conflict-free topic branches so far. -

-As a consequence, I think I'll add an option --sprout to the revision -walker which will fake octopus merges (or a series of two-parent merges) -whenever it finds a perl of non-merge commits that are theoretically -independent, i.e. whose patches apply cleanly.]]> - diff --git a/source-1233706294.txt b/source-1233706294.txt deleted file mode 100644 index 4ff607e354..0000000000 --- a/source-1233706294.txt +++ /dev/null @@ -1,24 +0,0 @@ -Problems with split-topic-branches.sh - -So my little script that should help me to split my topic branches does -not work properly. - -First some background: the idea was to let ''git blame'' do the hard work -to find overlapping changes, i.e. changes that would conflict when -changing the order (or skipping the first change, on which the next builds). - -The first problem with that approach: when lines are _removed_ by one -commit, and the next commit touches the same location, ''git blame'' does -not find that the first commit is required by the second. - -Therefore I introduced a really slow reverse thing which tries to find -those commits whose removals survived until the parent of a particular -commit, but not further. - -However, it does not work properly. Basically, only context sizes that -span the whole files lead to conflict-free topic branches so far. - -As a consequence, I think I'll add an option --sprout to the revision -walker which will fake octopus merges (or a series of two-parent merges) -whenever it finds a perl of non-merge commits that are theoretically -independent, i.e. whose patches apply cleanly. -- 2.11.4.GIT