# # patch "monotone.cc" # from [3119182ccd47b15467fb05e68c94a08914efbeb1] # to [e0a071fb1e12612b463e109f4a2088a48f7412e2] # # patch "rev_file_list.cc" # from [2780a7a19841e6588e6179a34ee1e44758c85c20] # to [3c575f3689809c95108ab728270cf94d97fe75eb] # ======================================================================== --- monotone.cc 3119182ccd47b15467fb05e68c94a08914efbeb1 +++ monotone.cc e0a071fb1e12612b463e109f4a2088a48f7412e2 @@ -15,6 +15,10 @@ #include +// For future reference: CreateProcess and WaitForMultipleObjects on win32 +// to replace fork/exec and select? +// Put in a 'class Platform {};'? + inline int max(int a, int b) {return (a>b)?a:b;} monotone::monotone(): pid(-1) ======================================================================== --- rev_file_list.cc 2780a7a19841e6588e6179a34ee1e44758c85c20 +++ rev_file_list.cc 3c575f3689809c95108ab728270cf94d97fe75eb @@ -379,11 +379,15 @@ else rd->rfi.set_diff(rd->mtn->diff(filename, parent, rev)); } + else + rd->rfi.set_diff("No diff available."); if (wc) rd->rfi.set_contents(readfile(fullname)); else if (row[col.status] != states::dropped) rd->rfi.set_contents(rd->mtn->cat(filename, rev)); + else + rd->rfi.set_contents("File dropped -- contents not available"); std::vector c; for (std::vector::iterator i = certs.begin(); i != certs.end(); ++i)