tfs2010 - Require a file to be checked in / merged in to two places in TFS 2010 -

-

we have our development branch has multiple revisions of our code. looks like:

development

      r1.0       r2.0       r3.0       rx

we working on multiple releases simultaneously. so, team work on r2.0 while team b work on r3.0. while team making changes in r2.0, need make sure these changes reflected in r3.0. there way require developer check in file r3.0 if he/she attempting check file in r2.0?

edit 8/1/2013

after reading several articles on branching , merging strategies, have idea of how should approach issue. want run , ask if i'm headed in right direction. so, instead of having development branch , copies of releases, should have main (development) branch, , branch off of each release. then, defined in our branching , merging strategy, merge changes in our r1.0 , r2.0 branches main. , when want work on r3.0, fresh merge of r1.0 , r2.0 main, , create new branch main. then, need hotfix r1.0, create r1.1 r1.0 , merge r1.0 main, main r2.0 , r3.0. work on new releases simultaneously, keep main current our next release. if r1.0 has been released already, main should kept date r2.0 branch since next release. please correct me if i’m wrong , point me in right direction. new branching , merging.

i idea , think handle problem. doing similar except have merge branch(intermediate branch) in between main , releases.

main -> intermediate -> r1

main -> intermediate -> r2

main -> intermediate -> r3

the advantage of option that:

  1. you dont have bring in changes main (trunk) , main stay clear , act golden production code.
  2. adds layer of protection golden code. let's say, r3 branch created intermediate, @ point r2 decided scrap release. in case, if go intermediate branch (which has r1 + r2 @ point) can delete intermediate branch , branch off main( has r1) create new intermediate (instead of rolling backing changes approach). start off new r3.

just my$0.02


Comments

Post a Comment

Popular posts from this blog

c++ - Creating new partition disk winapi -

-
i'am trying create new partition , mount volume new, thought createfile let me this, code : lpctstr lpfilename=l"\\\\.\\device\\harddisk0\\partition3"; handle handl=createfile( lpfilename, generic_read | generic_write, file_share_read | file_share_write, null, create_always, file_attribute_normal, null ); if (handl==invalid_handle_value) { qdebug()<<"handl invalid"<<" error"<<getlasterror();} bool success = definedosdevice(ddd_raw_target_path,l"i:",l"\\device\\harddisk0\\partition3"); if(!success) qdebug()<<" definedosdevice failed "<<getlasterror(); bflag = getvolumenameforvolumemountpoint( l"i:\\", // input volume mount point or directory /** u in dir
Read more

Android Prevent Bluetooth Pairing Dialog -

-
i'm developing internal application uses bluetooth printing. want bluetooth pairing occur without user input. have managed working trapping android.bluetooth.device.action.pairing_request broadcast. in broadcast receiver call setpin method, , pairing works ok, bluetoothpairingdialog displayed second or two, disappears - see link below. https://github.com/android/platform_packages_apps_settings/blob/master/src/com/android/settings/bluetooth/bluetoothpairingdialog.java since broadcast non-ordered, can't call abortbroadcast() , , wondering if there other way prevent pairing dialog appearing. can hook window manager in way? i haven't been able come way without modifying sdk. if you're oem, it's easy (i'm on 4.3): in packages/apps/settings/androidmanifest.xml, comment intent filter pairing dialog: <activity android:name=".bluetooth.bluetoothpairingdialog" android:label="@string/bluetooth_pairing_request"
Read more

php - joomla get content in onBeforeCompileHead function -

-
i'm developing joomla system plugin. need add javascript , css files if [myshortcode] shortcode found in content. how can content in onbeforecompilehead function function onbeforecompilehead() { $document = jfactory::getdocument(); //add scripts if shortcode found ... $document->addstylesheet($cssfile, 'text/css', null, array()); the $content = jresponse::getbody(); not work. thanks try this, for style sheet, $document = jfactory::getdocument(); $document->addstylesheet('http://domain.com/templates/css/style.css'); for javascript file $document = jfactory::getdocument(); $document->addscript('full url'); also can this, $document = jfactory::getdocument(); // add javascript $document->addscriptdeclaration(' window.event("domready", function() { alert("an inline javascript declaration"); }); '); // add styles $style = 'body {'
Read more