tfs2010 - TFS 2010: How to handle external "branched-in" dependencies on working branches -


is there established "best practice" handling external dependencies in tfs working branches? mean is, have project in tfs contains common third-party libraries (in case i'm dealing log4net), branch our other projects needed. we're making significant change i'm doing on separate working branch, requires newer version of component. looks this:

$/thirdparty   /bin     /log4net  $/product   /main     /thirdparty       /lognet      <-- $/thirdparty/bin/log4net   /working1        <-- $/product/main     /thirdparty       /log4net     <-- $/product/main/lognet <-- $/thirdparty/bin/log4net

part of work requires rebuilding log4net against .net 4 client profile , bringing in new version. normally, when upgrade third party component, it's checked $/thirdparty in appropriate folder, individual projects free merge latest binary, or not, see fit.

as far have can determine, in order latest changeset $/thirdparty/bin/log4net need merge $/product/main, check merge tfs, merge branch $/product/working1. that's want avoid, because don't want disrupt main branch.

so, guess 2 questions:

  1. is there way merge work without having check main branch?

  2. is there better overall strategy handling these kind of dependencies while still keeping them in tfs? (i know tfs isn't "meant" binaries, because of easy multiple-version , history tracking out of it).

answer 1:
yes. can baseless merge thirdparty working1. here's msdn page:
http://msdn.microsoft.com/en-us/library/bb668976.aspx

as 2: if main project can use 2+ different versions of 3rd party binary, recommend storing separate versions of 3rd party binary in $/thirdparty area , not having direct link between files in 3rd party area , main area.


Comments

Post a Comment

Popular posts from this blog

c# - SharpSVN - How to get the previous revision? -

i trying find efficient way previous revision of file text comparison using sharpsvn. using (svnclient c = new svnclient()) { c.authentication.defaultcredentials = new networkcredential( configurationmanager.appsettings.get("svnserviceusername") , configurationmanager.appsettings.get("svnservicepassword") , configurationmanager.appsettings.get("svnservicedomain") ); c.authentication.sslservertrusthandlers += new eventhandler<svnsslservertrusteventargs>(authentication_sslservertrusthandlers); collection<svnfileversioneventargs> fileversioncollection = new collection<svnfileversioneventargs>(); svnrevisionrange range = new svnrevisionrange(0, this.hooks.revision); svnfileversionsargs args = new svnfileversionsargs(); args.retrieveproperties = true; args.range = range; foreach (svnchangeitem item in log.changedpaths) { string path = this.repositorypath + it...
Read more

c++ - Is it possible to compile a VST on linux? -

for class project i'm attempting write vst plugin backed cuda. current cuda workflow on linux box, i'd prefer compile , link there. according wikipedia , should possible (i couldn't find steinberg documentation relevant linux) can't find makefile or instructions on how build if aren't using xcode or visual studio. i'm vst 3 sdk doesn't support linux. when try compile plugin under linux, error: ./base/source/fatomic.cpp:39:30: fatal error: libkern/osatomic.h: no such file or directory this issue caused following code in "vst3 sdk/base/source/fatomic.cpp" #if mac #include <libkern/osatomic.h> #if mac_os_x_version_min_required > mac_os_x_version_10_4 #define native_atomic_type (volatile int32_t*) #else #define native_atomic_type (int32_t*) #endif #elif windows #include <windows.h> #endif but hope compiling under linux work vst sdk 2.4. reading. jvstwrapper seems run on lin...
Read more

url - Querystring manipulation of email Address in PHP -

i using third party application (email2http) send me emailid, body , message. unable retrieve email id due name appended on , enclosed < , >. here querystring getting. test.php?from=ajay+reddy &subject=cx&body=somebody when print variable in php returns name , not email id. $from = $_get['from']; echo $from; //output ajay reddy please suggest me how can emailid also. i dont want use post method due testing , debugging. it's working fine. forgot use htmlentities() in debugging.
Read more