cook: some topics are tangled with each other
Junio C Hamano committed
Dec 8, 2010 at 15:36 UTC
097a2385d4a5dd4d1b89345fc4ae6698e08052f2
1 file changed
+3
-9
cook
+3
-9
index 41d88af668..2cb1343afc 100755
--- a/cook
+++ b/cook
@@ -50,7 +50,7 @@ sub describe_relation {
}
if (exists $topic_info->{'shares'}) {
- push @desc, ("shares commits with " .
+ push @desc, ("is tangled with " .
phrase_these(@{$topic_info->{'shares'}}));
}
@@ -97,14 +97,8 @@ sub topic_relation {
} elsif (!@right) {
forks_from($topic, $one, $two);
} else {
- if (@left < @right) {
- forks_from($topic, $two, $one, @left);
- } elsif (@right < @left) {
- forks_from($topic, $one, $two, @right);
- } else {
- push @{$topic->{$one}{'shares'}}, $two;
- push @{$topic->{$two}{'shares'}}, $one;
- }
+ push @{$topic->{$one}{'shares'}}, $two;
+ push @{$topic->{$two}{'shares'}}, $one;
}
}