Re: Script to instrument a 'svn diff' output to be more useful
Le 27/05/2018 à 20:09, Christophe Jaillet a écrit : Hi, From time to time, I try to synch 2.4.x with trunk in order to avoid to many differences between the 2. It is just small steps, but it may avoid some nightmares when something needs to be backported. To many differences lead to merge issue. So, IMHO, the closest, the better. I used to do it with a simple 'svn diff' + manual inspection of what 'looks' easy and safe to backport. Then 'svn blame' to spot the corresponding commit, then 'svn merge --dry-run' to see if it can be merged as-is. This is tedious. So today, I wrote a small script that automates most of the process. It merges the 'svn diff' with the 'svn blame' output in order to have most of the relevant information at the same place. Then, I can easily find commit numbers, who did it, if other commits numbers are around, search in the 2.4.x/trunk diff file... Very helpful to me (I wanted to write something like that for years). I think that it could be also useful for others for digging the code and/or proposing backports. It also helps to spot its own pieces of code that have never been backported :) This not httpd specific and it could be used to have a more instrumented 'svn diff' output to diff two branches of a svn repository. First, make the 'normal' diff file: diff -rup -X httpd_exclude.txt svn_httpd_2.4.x/ svn_httpd_trunk_unmodified/ > ~/diff_httpd_2.4.diff Then: ./my_history_httpd_2.4 diff_httpd_2.4.diff > diff_httpd_2.4_with_history.diff The 'my_history_httpd_2.4' script and the corresponding outputs are attached. Enjoy. Any feedback and/or improvement appreciated. CJ Forgot to also attach my httpd_exclude.txt list. CJ .svn srclib config\.log config\.nice config\.status Makefile NWGNU* CHANGES STATUS configure exports.c export_files output.txt *.o *.lo *.la *.slo *.deps *.libs *.su *.html *.meta *.utf8 *.svg *.1 *.8 *.da *.de *.en *.es *.euc-kr *.ja *.ko *.pt-br *.ru *.ru.koi8-r *.tr *.zh-cn *.html.fr *.fr dox docs docs
Bug report for Apache httpd-2 [2018/05/27]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major | | | | MIN=Minor NOR=NormalENH=Enhancement TRV=Trivial | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | | 8713|Inf|Min|2002-05-01|No Errorlog on PROPFIND/Depth:Infinity| | 8867|Opn|Cri|2002-05-07|exports.c generation fails when using a symlink to| |10747|New|Maj|2002-07-12|ftp SIZE command and 'smart' ftp servers results i| |11294|New|Enh|2002-07-30|desired vhost_alias option| |11580|Opn|Enh|2002-08-09|generate Content-Location headers | |12033|Opn|Nor|2002-08-26|Graceful restart immediately result in [warn] long| |13599|Inf|Nor|2002-10-14|autoindex formating broken for multibyte sequences| |13661|Ass|Enh|2002-10-15|Apache cannot not handle dynamic IP reallocation | |14104|Opn|Enh|2002-10-30|not documented: must restart server to load new CR| |14496|New|Enh|2002-11-13|Cannot upgrade any version on Windows. Must uninst| |14922|Inf|Enh|2002-11-28| is currently hardcoded to 'apache2' | |15719|Inf|Nor|2002-12-30|WebDAV MOVE to destination URI which is content-ne| |16761|Inf|Nor|2003-02-04|CustomLog with pipe spawns process during config | |16811|Ass|Maj|2003-02-05|mod_autoindex always return webpages in UTF-8.| |17107|New|Min|2003-02-16|Windows should not install printenv | |17114|New|Enh|2003-02-17|Please add strip and install-strip targets to Make| |17244|Ass|Nor|2003-02-20|./configure --help gives false information regardi| |17497|Opn|Nor|2003-02-27|mod_mime_magic generates incorrect response header| |18325|New|Enh|2003-03-25|PAM support for suEXEC| |18334|Inf|Cri|2003-03-25|Server crashes when authenticating users against L| |19670|New|Enh|2003-05-05|content type header supplied upon PUT is thrown aw| |20036|Ass|Nor|2003-05-19|Trailing Dots stripped from PATH_INFO environment | |21260|New|Nor|2003-07-02|CacheMaxExpire directive not enforced ! | |21533|Ass|Cri|2003-07-11|Multiple levels of htacces files can cause mod_aut| |22484|Opn|Maj|2003-08-16|semaphore problem takes httpd down| |22686|Opn|Nor|2003-08-25|ab: apr_poll: The timeout specified has expired (7| |22898|Opn|Nor|2003-09-02|nph scripts with two HTTP header | |23167|Inf|Cri|2003-09-14|--enable-layout never goes to apr apr-util| |23181|New|Nor|2003-09-15|Status 304 (Not modified) and chunking leads to an| |23238|New|Cri|2003-09-18|non-async-signal-safe operations from signal handl| |23330|New|Enh|2003-09-22|Enhance ApacheMonitor to view and control Tomcat s| |23911|Opn|Cri|2003-10-18|CGI processes left defunct/zombie under 2.0.54| |24031|New|Enh|2003-10-23|Passphrase protected private key in SSLProxyMachin| |24095|Opn|Cri|2003-10-24|ERROR "Parent: child process exited with status 32| |24437|Opn|Nor|2003-11-05|mod_auth_ldap doubly-escapes backslash (\) charact| |24890|Opn|Nor|2003-11-21|Apache config parser should not be local aware ( g| |25014|New|Enh|2003-11-26|A flexible interface for mod_log_config | |25201|New|Enh|2003-12-04|Provide Cache Purge operation | |25240|Inf|Enh|2003-12-05|SSL Library Error: 336105671 logged as information| |25435|New|Enh|2003-12-11|sethandler and directoryindex not playing nice| |25469|Opn|Enh|2003-12-12|create AuthRoot for defining paths to auth files | |25484|Ass|Nor|2003-12-12|Non-service Apache cannot be stopped in WinXP | |25543|Inf|Nor|2003-12-15|mod_proxy_ajp overwrites existing response headers| |25667|New|Nor|2003-12-19|Memory leak in function ssl_scache_dbm_retrieve().| |25863|New|Enh|2004-01-02|new per-host initialization hooks | |26142|New|Maj|2004-01-14|EnableSendFile Off for Windows XP Home| |26153|Opn|Cri|2004-01-15|Apache cygwin directory traversal vulnerability | |26368|New|Min|2004-01-23|File extensions in AddDescription treated as part | |26446|New|Nor|2004-01-26|flush buckets followed by eos bucket emit multiple| |26478|New|Enh|2004-01-28|mod_dav does not expose a method for setting the D| |26835|New|Enh|2004-02-10|[PATCH] Mod_status Readability & Browser Side Tabl|
