git merge - git cherry-pick being ancestor-aware, not just applying a patch? -

-

it sure nice if merge-like cleverness , awareness of common ancestors available in cherry-pick. possible?

suppose have situation. have development commits made dev , cherry-picked release. [1]

x----y---a1---a2---b---z   dev   \    \----b'                 release   a1: remove function foo()  a2: re-add function foo() (ooops, needed) , change function bar()      (a1 , a2 listed becuase 2 commits, attempts, fix same bug.)  b:  modify function foo()  b': b cherry-picked release branch  x, y, z: changes touching unrelated files. no conflicts here.

now want cherry-pick a1 , a2 release branch. obviously, cannot cherry-pick them because there conflict on deletion/modification of foo().

but smart person see how a1 , a2 delete , re-add foo() , how can indeed merged release branch. , make algorithm take commits dev occur after a1,a2 in release, go commit before that, , re-apply a1, a2, b in order applied dev take final state of files , put after b' on release branch. (because on release branch, no history modification ever allowed.)

and that's fine , well, gets hairy pretty quickly. sure nice if merge-like cleverness , awareness of common ancestors available in cherry-pick. possible?

steve

[1] know think ridiculous. please don't bother telling me that. honestly, more complicated think , there reasons it. have tried keep things simple question , it's not in anybody's best interest have multi-page explanation of why, in case, right thing do.


Comments

Post a Comment

Popular posts from this blog

mysql - FireDac error 314 - but DLLs are in program directory -

-
i getting when trying access mysql database : [firedac][phys][mysql]-314. cannot load vendor library [libmysql.dll or libmysqlld.dll] this did not happen (unchanged) code, however, have upgraded windows 10 , had reinstall delphi xe8, system configuration matter. in order try solve problem, copied both of files c:\windows\sysytem32. when did not seem work, copied them \win32\debug, generated .exe resides. i imagine doing rather stupid, can't see what. the proper solution place driver file (eg., libmysql.dll ) in application's folder, or place installation location in fddrivers.ini file: [mysql] vendor=<folder>\libmysql.dll (recent versions of documentation seem use vendorlib instead of vendor in ini file.) see rad studio documentation topics configuring drivers (firedac) , connect mysql server (firedac) more information.
Read more

Log not being recorded for quickfix c++ Session -

-
i running fix initiator , succesfully connecting acceptor. problem is, no log being recorded. .cfg application written below. [default] connectiontype=initiator reconnectinterval=2 resetonlogon=y filestorepath=store filelogpath=logging starttime=00:00:00 endtime=00:00:00 usedatadictionary=y # standard config elements [session] # inherit connectiontype, reconnectinterval , sendercompid default beginstring=fix.4.4 sendercompid=init targetcompid=accept socketconnecthost=xxx socketconnectport=xxx heartbtint=30 datadictionary=fix44md.xml [session] beginstring=fix.4.4 sendercompid=init targetcompid=accept1 socketconnecthost=xxx socketconnectport=xxx heartbtint=30 datadictionary=fix44oms.xml the excerpt code initiates connection written below: std::string file = argv[ 1 ]; fix::sessionsettings settings( file ); application application; fix::filestorefactory storefactory( settings ); fix::screenlogfactory logfactory( settings ); fix::socketinitiator initi...
Read more

ios - NSFetchedResultsController not calling delegate methods on changes using NSPredicate with subquery -

-
i have nsfetchedresultscontroller created follows: let fetchrequest = nsfetchrequest(entityname: "friendship") fetchrequest.sortdescriptors = [ nssortdescriptor(key: "friendtocurrentuser.displayname", ascending: true) ] fetchrequest.predicate = nspredicate(format: "subquery(friendtocurrentuser.trackingsessions, $x, $x.dataisstale == false , $x.enddate == nil).@count != 0") let fetchedresultscontroller = nsfetchedresultscontroller(fetchrequest: fetchrequest, managedobjectcontext: coredatamanager.instance.mainmanagedobjectcontext, sectionnamekeypath: nil, cachename: nil) fetchedresultscontroller.delegate = self var error: nserror? if !fetchedresultscontroller.performfetch(&error) { println(error) } when initial fetch completes controller:didchangeobject:atindexpath:forchangetype: called, when object should added/removed due subquery method not called. if simple delegate methods aren't called when predicate contains subquery tha...
Read more