From: dan Date: Fri, 2 Mar 2001 01:46:23 +0000 (-0800) Subject: [svn] ChangeLog.README: Renamed from README.branches and added a note that Wget has X-Git-Tag: v1.13~2252 X-Git-Url: http://sjero.net/git/?p=wget;a=commitdiff_plain;h=691601f81c6bb95fe4e2e715e021f25bf5fe0a5e [svn] ChangeLog.README: Renamed from README.branches and added a note that Wget has multiple ChangeLog files (currently ./ChangeLog, doc/ChangeLog, and src/ChangeLog), since this is unusual and people have complained their patches hadn't been applied after checking only the top-level ChangeLog. --- diff --git a/ChangeLog b/ChangeLog index 42d9cc12..39f86ebb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2001-03-01 Dan Harkless + + * ChangeLog.README: Renamed from README.branches and added a note + that Wget has multiple ChangeLog files (currently ./ChangeLog, + doc/ChangeLog, and src/ChangeLog), since this is unusual and + people have complained their patches hadn't been applied after + checking only the top-level ChangeLog. + 2001-02-28 Dan Harkless * MACHINES: Explicitly tell people to send us config.guess output. diff --git a/ChangeLog.README b/ChangeLog.README new file mode 100644 index 00000000..a90aba4a --- /dev/null +++ b/ChangeLog.README @@ -0,0 +1,38 @@ +Please note that Wget has more than one ChangeLog file: + + ./ChangeLog: documents changes to files in the top-level directory + and to files in subdirectories like po/ that don't have + their own ChangeLogs + + doc/ChangeLog: documents only changes to files in the doc directory + + src/ChangeLog: documents only changes to files in the src directory + +When checking to see if a patch you sent in has been applied, please +look in the appropriate ChangeLog(s). + +In addition, you'll notice the ChangeLog-branches directories. + +In late 2000, time constraints delayed the release of Wget 1.6. While +it was awaiting release, people had new features and other changes they +wanted added to the CVS archive, but these were deemed not safe to +introduce just before a release. + +The solution was to split the stable 1.6 off onto its own branch, while +free-wheeling development continued on the main branch (whose version +was changed from 1.5.3+dev to 1.7-dev). + +Unfortunately it's difficult to portray this branched development in the +flat ChangeLog file. Either you include 1.6-branch changes in the +1.7-branch ChangeLog, in which case it becomes impossible to tell what +release version a given change first went into Wget, just judging by +date and position in the ChangeLog, or you omit all 1.6-branch changes +from the 1.7-branch ChangeLog, in which case all evidence of the +existence of 1.6 (and further information about that branch) disappears +from future versions of Wget. + +The solution that was decided upon was to make a subdirectory called +ChangeLog-branches adjacent to each ChangeLog file. Inside is the +corresponding ChangeLog from the most recent release on the stable +branch (e.g. 1.6_branch.ChangeLog). This way, no information is lost +and there's no misleading information in the ChangeLog. diff --git a/README.branches b/README.branches deleted file mode 100644 index 5f9cabb7..00000000 --- a/README.branches +++ /dev/null @@ -1,23 +0,0 @@ -In late 2000, time constraints delayed the release of Wget 1.6. While -it was awaiting release, people had new features and other changes they -wanted added to the CVS archive, but these were deemed not safe to -introduce just before a release. - -The solution was to split the stable 1.6 off onto its own branch, while -free-wheeling development continued on the main branch (whose version -was changed from 1.5.3+dev to 1.7-dev). - -Unfortunately it's difficult to portray this branched development in the -flat ChangeLog file. Either you include 1.6-branch changes in the -1.7-branch ChangeLog, in which case it becomes impossible to tell what -release version a given change first went into Wget, just judging by -date and position in the ChangeLog, or you omit all 1.6-branch changes -from the 1.7-branch ChangeLog, in which case all evidence of the -existence of 1.6 (and further information about that branch) disappears -from future versions of Wget. - -The solution that was decided upon was to make a subdirectory called -ChangeLog-branches adjacent to each ChangeLog file. Inside is the -corresponding ChangeLog from the most recent release on the stable -branch (e.g. 1.6_branch.ChangeLog). This way, no information is lost -and there's no misleading information in the ChangeLog.