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
@@ -50,7 +50,7 @@ sub describe_relation {
50
}
51
52
if (exists $topic_info->{'shares'}) {
53
- push @desc, ("shares commits with " .
53
+ push @desc, ("is tangled with " .
54
phrase_these(@{$topic_info->{'shares'}}));
55
}
56
@@ -97,14 +97,8 @@ sub topic_relation {
97
} elsif (!@right) {
98
forks_from($topic, $one, $two);
99
} else {
100
- if (@left < @right) {
101
- forks_from($topic, $two, $one, @left);
102
- } elsif (@right < @left) {
103
- forks_from($topic, $one, $two, @right);
104
- } else {
105
- push @{$topic->{$one}{'shares'}}, $two;
106
- push @{$topic->{$two}{'shares'}}, $one;
107
- }
100
+ push @{$topic->{$one}{'shares'}}, $two;
101
+ push @{$topic->{$two}{'shares'}}, $one;
102
}
103
}
104