Re: [Treebase-devel] New commits

[Hilmar L. <hl...@ne...>]

You can use "svn copy" with the -r parameter to specify the date or revision at which you want to retroactively branch off.

However, in this case it sounds like you want to maintain the more "conservative code" (i.e., the code without some new features) on the main trunk, and the new feature on the branch. In that case I would branch off (svn copy) from trunk/ now (without using -r), which keeps all the new code on that branch. Then on the main trunk undo the commits that introduced the for now unwanted functionality using reverse merge:
http://svnbook.red-bean.com/en/1.2/svn.branchmerge.commonuses.html#svn.branchmerge.commonuses.undo

BTW any reason why this wasn't on the developers list?

	-hilmar

> ---------- Forwarded message ----------
> From: Rutger Vos <rut...@gm...>
> Date: Tue, Jun 19, 2012 at 12:30 PM
> Subject: Re: New commits
> To: William Piel <wil...@ya...>
> Cc: Mattison Ward <mat...@ne...>, Harry Shyket
> <har...@ya...>
> 
> 
> Hi Bill,
> 
> you're right, it would be nice if the new search functionality was on
> a separate branch so that other fixes can continue more easily. I'm
> afraid I'm actually not experienced with creating branches
> retroactively, does anyone else know?
> 
> Rutger
> 
> On Tue, Jun 19, 2012 at 5:47 PM, William Piel <wil...@ya...> wrote:
>> 
>> Hi Rutger,
>> 
>> I guess I'm a little conflicted about the new changes you've made: on the
>> one hand, the one-field system is has a nice Zen to it, on the other hand we
>> will be losing the ability to do more sophisticated searches. I wonder if we
>> can "shelve" this new interface for a little while until we have an
>> opportunity to have the best of both worlds: i.e. a radio-button that would
>> allow building queries or de-novo queries. On the other hand, some minor
>> fixes are being made and those cannot be pushed to production.
>> 
>> What do people think about the possibility of forking your changes
>> temporarily so that these newer minor changes can be applied to production,
>> and then at a later date (once the radio-button has been fixed) reconcile
>> the fork back into production?
>> 
>> bp
>> 
>> 
>> 
>> On May 29, 2012, at 4:06 AM, Rutger Vos wrote:
>> 
>> Do you think it's possible to have a radio-button switch somewhere in the
>> 
>> header: "New queries applied to previous results vs. New queries are always
>> 
>> de novo" ?
>> 
>> 
>> Sure, that would definitely be possible, but I'm afraid I don't really
>> have the time this week or the next to make it so. Can we put it in
>> the issue tracker?
>> 
>> 
> 
> 
> 
> --
> Dr. Rutger A. Vos
> Bioinformaticist
> NCB Naturalis
> Visiting address: Office A109, Einsteinweg 2, 2333 CC, Leiden, the Netherlands
> Mailing address: Postbus 9517, 2300 RA, Leiden, the Netherlands
> http://rutgervos.blogspot.com

-- 
===========================================================
: Hilmar Lapp  -:- Durham, NC -:- informatics.nescent.org :
===========================================================