dilim/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-08-09 17:40:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

UWC: do not lose description for graduated topics

Browse Source
This commit is contained in:
Junio C Hamano
2007-12-07 01:09:38 -08:00
parent 5a349d0db8
commit d3cd72a090
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
UWC
View File

@@ -97,7 +97,7 @@ sub parse_whats_cooking {
next;
}
if (/^ [-+.?] / || /^ \S/) {
if (/^ [-+.?*] / || /^ \S/) {
$topic->{"names"} .= $_;
next;
}
@@ -151,8 +151,12 @@ sub merge_whats_cooking {
my $newtopic = delete $new_wc->{"topic hash"}{$name};
if (!defined $newtopic) {
$topic->{"text"} = ("<<deleted\n" .
$topic->{"head"} .
$topic->{"names"} .
">>\n\n" .
$topic->{"text"});
$topic->{"names"} = "";
$topic->{"text"} = "<<deleted>>";
next;
}
if (($newtopic->{"names"} ne $topic->{"names"}) ||