I've successfully un-backported the offending commits (AFAICT) and blocked the rest of my commits which don't belong in 0.9.x
I had the command line handy so I generated the log info for all un-blocked commits: ------------------------------------------------------------------------ r758093 | damien | 2009-03-24 19:48:33 -0400 (Tue, 24 Mar 2009) | 1 line Fix for crash when compacting an empty database ------------------------------------------------------------------------ ------------------------------------------------------------------------ r758723 | jan | 2009-03-26 12:28:21 -0400 (Thu, 26 Mar 2009) | 1 line return Location header for newly create databases ------------------------------------------------------------------------ ------------------------------------------------------------------------ r758768 | jan | 2009-03-26 13:40:27 -0400 (Thu, 26 Mar 2009) | 1 line return a Location header on newly created documents using PUT requests ------------------------------------------------------------------------ ------------------------------------------------------------------------ r758942 | jan | 2009-03-26 20:26:39 -0400 (Thu, 26 Mar 2009) | 1 line Location header responses should be absolute URIs, thanks Christopher ------------------------------------------------------------------------ ------------------------------------------------------------------------ r759588 | jan | 2009-03-28 17:02:41 -0400 (Sat, 28 Mar 2009) | 1 line always load _conflicts in _show functions ------------------------------------------------------------------------ ------------------------------------------------------------------------ r760533 | jan | 2009-03-31 13:31:20 -0400 (Tue, 31 Mar 2009) | 1 line unify including of couch_db.hrl ------------------------------------------------------------------------ ------------------------------------------------------------------------ r762019 | kocolosk | 2009-04-04 17:47:12 -0400 (Sat, 04 Apr 2009) | 2 lines Use now_diff instead of statistics(runtime). Closes COUCHDB-316 ------------------------------------------------------------------------ ------------------------------------------------------------------------ r762153 | kocolosk | 2009-04-05 16:34:35 -0400 (Sun, 05 Apr 2009) | 4 lines added compaction for view indexes. See COUCHDB-92 No tests or Futon interface for this feature yet. ------------------------------------------------------------------------ ------------------------------------------------------------------------ r762574 | jan | 2009-04-06 20:07:02 -0400 (Mon, 06 Apr 2009) | 1 line Add null_authentication_handler. It is useful when running CouchDB behind an authenticating proxy which proxies the basic auth http headers to CouchDB. Having no admins defined makes authentication impossible. Use the null_authentication_handler instead. ------------------------------------------------------------------------ ------------------------------------------------------------------------ r763816 | damien | 2009-04-09 17:37:23 -0400 (Thu, 09 Apr 2009) | 1 line Fix for attachment sparseness bug COUCHDB-220 by giving each attachment it's own stream and calling set_min_buffer instead of ensure_buffer. Also fixed spurious couch_file crash messages by putting the statistics decrement code into a seperate monitoring process. ------------------------------------------------------------------------ ------------------------------------------------------------------------ r763818 | damien | 2009-04-09 17:39:30 -0400 (Thu, 09 Apr 2009) | 1 line Removal of unused member in write_stream record. ------------------------------------------------------------------------ ------------------------------------------------------------------------ r763833 | damien | 2009-04-09 18:36:49 -0400 (Thu, 09 Apr 2009) | 1 line Fix to allow couch_file use in tests without the server being started. ------------------------------------------------------------------------ ------------------------------------------------------------------------ r763858 | damien | 2009-04-09 22:21:37 -0400 (Thu, 09 Apr 2009) | 1 line Fixes for leaked file handles, with test. ------------------------------------------------------------------------ ------------------------------------------------------------------------ r764257 | jchris | 2009-04-11 18:20:22 -0400 (Sat, 11 Apr 2009) | 2 lines refactor: extract method from doc_flush_binaries. add with_stream/2 to handle automatically opening and closing binary streams. ------------------------------------------------------------------------ ------------------------------------------------------------------------ r764835 | jan | 2009-04-14 11:38:26 -0400 (Tue, 14 Apr 2009) | 1 line whitespace ------------------------------------------------------------------------ ------------------------------------------------------------------------ r765364 | kocolosk | 2009-04-15 17:21:23 -0400 (Wed, 15 Apr 2009) | 2 lines URL-encode attachment paths during replication ------------------------------------------------------------------------ ------------------------------------------------------------------------ r765419 | jchris | 2009-04-15 19:20:16 -0400 (Wed, 15 Apr 2009) | 2 lines add bulkSave method to jquery.couch.js ------------------------------------------------------------------------ ------------------------------------------------------------------------ r765819 | jchris | 2009-04-16 20:47:50 -0400 (Thu, 16 Apr 2009) | 2 lines output errors differently during chunked responses (view and list) ------------------------------------------------------------------------ ------------------------------------------------------------------------ r766338 | nslater | 2009-04-18 11:20:00 -0400 (Sat, 18 Apr 2009) | 1 line create /var/run/couchdb during init script ------------------------------------------------------------------------ ------------------------------------------------------------------------ r766340 | nslater | 2009-04-18 11:28:49 -0400 (Sat, 18 Apr 2009) | 1 line updated for recent changes ------------------------------------------------------------------------ ------------------------------------------------------------------------ r766383 | jchris | 2009-04-18 16:15:44 -0400 (Sat, 18 Apr 2009) | 2 lines refactor main.js into many files and improve show/list error handling ------------------------------------------------------------------------ ------------------------------------------------------------------------ r766390 | jan | 2009-04-18 16:50:25 -0400 (Sat, 18 Apr 2009) | 1 line integrate main.js split-up into build system ------------------------------------------------------------------------ ------------------------------------------------------------------------ r766392 | jan | 2009-04-18 16:58:24 -0400 (Sat, 18 Apr 2009) | 1 line run mainjs.sh if one of the source files changed ------------------------------------------------------------------------ ------------------------------------------------------------------------ r766399 | jan | 2009-04-18 18:18:52 -0400 (Sat, 18 Apr 2009) | 1 line add generation-notice ------------------------------------------------------------------------ ------------------------------------------------------------------------ r766406 | jan | 2009-04-18 19:32:56 -0400 (Sat, 18 Apr 2009) | 1 line move main.js generation to Makefile ------------------------------------------------------------------------ ------------------------------------------------------------------------ r766407 | jan | 2009-04-18 19:56:53 -0400 (Sat, 18 Apr 2009) | 1 line fix make distcheck, thanks Noah ------------------------------------------------------------------------ ------------------------------------------------------------------------ r766456 | jan | 2009-04-19 08:12:42 -0400 (Sun, 19 Apr 2009) | 1 line whitespace ------------------------------------------------------------------------ ------------------------------------------------------------------------ r766467 | jan | 2009-04-19 09:48:40 -0400 (Sun, 19 Apr 2009) | 1 line add a startup checkpoint to couch.log ------------------------------------------------------------------------ ------------------------------------------------------------------------ r766476 | jan | 2009-04-19 10:40:18 -0400 (Sun, 19 Apr 2009) | 1 line add server/main.js to all: target ------------------------------------------------------------------------ ------------------------------------------------------------------------ r766493 | jan | 2009-04-19 13:57:37 -0400 (Sun, 19 Apr 2009) | 1 line fix ./configure --help output, ERL[C]_EXECUTABLE are now ERL[C] ------------------------------------------------------------------------ ------------------------------------------------------------------------ r766506 | jan | 2009-04-19 16:04:14 -0400 (Sun, 19 Apr 2009) | 1 line add main.js to install files. Noah, can you double check? ------------------------------------------------------------------------ ------------------------------------------------------------------------ r766751 | jan | 2009-04-20 12:55:13 -0400 (Mon, 20 Apr 2009) | 1 line be more verbose ------------------------------------------------------------------------ ------------------------------------------------------------------------ r766767 | nslater | 2009-04-20 13:33:23 -0400 (Mon, 20 Apr 2009) | 1 line Makefile.am improvements ------------------------------------------------------------------------ ------------------------------------------------------------------------ r766883 | damien | 2009-04-20 17:34:46 -0400 (Mon, 20 Apr 2009) | 1 line Fix for process leaks with retrying compactions. ------------------------------------------------------------------------ ------------------------------------------------------------------------ r767164 | nslater | 2009-04-21 10:51:17 -0400 (Tue, 21 Apr 2009) | 1 line added new configuration system ------------------------------------------------------------------------ ------------------------------------------------------------------------ r767175 | nslater | 2009-04-21 11:08:10 -0400 (Tue, 21 Apr 2009) | 1 line updated for configuration changes ------------------------------------------------------------------------ ------------------------------------------------------------------------ r767176 | nslater | 2009-04-21 11:08:45 -0400 (Tue, 21 Apr 2009) | 1 line added note about breaking changes ------------------------------------------------------------------------ ------------------------------------------------------------------------ r767190 | nslater | 2009-04-21 11:34:44 -0400 (Tue, 21 Apr 2009) | 1 line fixed variable replacement ------------------------------------------------------------------------ ------------------------------------------------------------------------ r767204 | nslater | 2009-04-21 12:18:52 -0400 (Tue, 21 Apr 2009) | 1 line only pick up files in configuration directories ------------------------------------------------------------------------ ------------------------------------------------------------------------ r767206 | nslater | 2009-04-21 12:22:03 -0400 (Tue, 21 Apr 2009) | 1 line added -A for adding configuration directories ------------------------------------------------------------------------ ------------------------------------------------------------------------ r767208 | nslater | 2009-04-21 12:26:14 -0400 (Tue, 21 Apr 2009) | 1 line added -maxdepth 1 to configuration directory find invokation ------------------------------------------------------------------------ ------------------------------------------------------------------------ r767362 | jan | 2009-04-22 00:15:19 -0400 (Wed, 22 Apr 2009) | 1 line trunk is 0.10.0a ------------------------------------------------------------------------ ------------------------------------------------------------------------ r767506 | nslater | 2009-04-22 09:02:47 -0400 (Wed, 22 Apr 2009) | 1 line corrected background option ------------------------------------------------------------------------ ------------------------------------------------------------------------ r769181 | jan | 2009-04-27 18:04:18 -0400 (Mon, 27 Apr 2009) | 1 line add newline at the end of ini file to make quick editing work, also POSIX ------------------------------------------------------------------------ ------------------------------------------------------------------------ r769211 | jan | 2009-04-27 20:16:34 -0400 (Mon, 27 Apr 2009) | 1 line undo local change ------------------------------------------------------------------------ ------------------------------------------------------------------------ r769792 | kocolosk | 2009-04-29 10:07:09 -0400 (Wed, 29 Apr 2009) | 2 lines Closes COUCHDB-320 (ignore Content-Type in _temp_view). Thanks B. Candler ------------------------------------------------------------------------ ------------------------------------------------------------------------ r771418 | jchris | 2009-05-04 15:59:39 -0400 (Mon, 04 May 2009) | 3 lines Use batch=ok query param for document PUT and POST to defer index updates until a threshold of documents (or amount of time) has been passed. This option returns a 202 Accepted response instead of a 201 Created, so do not use it for applications which require all data to be saved safely to disk. It is ideal for applications like logging where losing some events in a crash will be ok. ------------------------------------------------------------------------ ------------------------------------------------------------------------ r771466 | jchris | 2009-05-04 18:06:01 -0400 (Mon, 04 May 2009) | 2 lines reduce_limit error is thrown when the reduce function output is not small enough compared to the input. Errors can be switched off using the config API. ------------------------------------------------------------------------ ------------------------------------------------------------------------ r771467 | jchris | 2009-05-04 18:11:46 -0400 (Mon, 04 May 2009) | 1 line helpful note about config setting ------------------------------------------------------------------------ ------------------------------------------------------------------------ r771474 | kocolosk | 2009-05-04 18:25:23 -0400 (Mon, 04 May 2009) | 2 lines standalone attachment GETs should respect "rev" qs param ------------------------------------------------------------------------ ------------------------------------------------------------------------ r771480 | kocolosk | 2009-05-04 18:36:46 -0400 (Mon, 04 May 2009) | 2 lines use revisions when replicating attachments. Closes COUCHDB-337 ------------------------------------------------------------------------ davis-2318:/usr/local/src/srsly/with-branches davisp$ On Tue, May 5, 2009 at 11:53 AM, Paul Davis <[email protected]> wrote: > On Tue, May 5, 2009 at 10:59 AM, Chris Anderson <[email protected]> wrote: >> On Tue, May 5, 2009 at 7:36 AM, Paul Davis <[email protected]> >> wrote: >>> On Tue, May 5, 2009 at 10:30 AM, Chris Anderson <[email protected]> wrote: >>>> On Tue, May 5, 2009 at 5:16 AM, Paul Davis <[email protected]> >>>> wrote: >>>>> Noah Slater wrote: >>>>>> >>>>>> On Mon, May 04, 2009 at 11:57:43PM -0400, Paul Davis wrote: >>>>>> >>>>>>> >>>>>>> That said, what keeps us from 0.10? I did contemplate the the jump from >>>>>>> 0.9 isn't as big as the jump from 0.8. Though, I would probably say that >>>>>>> the jump from 0.8 to 0.9 was fairly delayed. At the moment there are at >>>>>>> least three new features: config.d updates, bulk=ok, and the reduce >>>>>>> warnings; none of which seem like only a $(REVISON) change. To me that >>>>>>> doesn't seem like something to ignore but I would be perfectly happy >>>>>>> referring to version numbers via subversion revision so I'm a bit not >>>>>>> normal on that front. >>>>>>> >>>>>> >>>>>> Just to be clear, my configuration changes were not merged back. >>>>>> >>>>>> What changes, specifically, do you think should be pulled from the 0.9.x >>>>>> branch? >>>>>> >>>>>> >>>>> >>>>> I haven't the slightest cause I have no idea what the guidelines are. >>>>> >>>> >>>> I'm pretty sure the guidelines are: in the 0.9.x branch, fix bugs, >>>> don't change behavior in a way that would break clients. >>>> >>>> Bad candidates for 0.9.x: the reduce_limit patch I just applied to >>>> trunk, changes in query-string validation, totally new features like >>>> batch=ok >>>> >>>> Good candidates for 0.9.x: reduce sparseness in db files, make >>>> replication more complete/reliable, fix arbitrary resource limits >>>> (like the 100+ open dbs bug) >>>> >>>> I think that's pretty clear, but don't hesitate to ask if it could be >>>> more clear. >>>> >>>> Chris >>>> >>>> -- >>>> Chris Anderson >>>> http://jchrisa.net >>>> http://couch.io >>>> >>> >>> Sounds good. I'll have to figure out how to un-merge a couple patches >>> to 0.9.x then because I definitely pushed a couple that would break >>> client code relying on some of the different parameters being silently >>> ignored. >>> >>> Anyone have any idea on how one does that in SVN? >>> >> >> I think you can follow these instruction to back out the revisions in >> which your backport merges were committed to 0.9.x >> >> http://svnbook.red-bean.com/en/1.5/svn.branchmerge.basicmerging.html#svn.branchmerge.basicmerging.undo >> >> Hope that helps! >> >> Chris >> >> >> -- >> Chris Anderson >> http://jchrisa.net >> http://couch.io >> > > Chris, > > Awesome. I'll go through what I backported and un-backport (forward > port?) them tonight. Also, how did I ever like svn? > > Paul >
