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

html - Firefox flex bug applied to buttons? -

-
i'm trying apply flex button on firefox i'm having problem on chrome doesn't happens. this css: .button { display: inline-flex; align-items: center; } as can see in fiddle, "caret" word moved new line, happens if element <button> tag, <div> works expected. http://codepen.io/anon/pen/xblmgx is firefox bug or there css i'm missing? nevermind, looks "mr firefox" doesn't idea... <button> not implementable (by browsers) in pure css, bit of black box, perspective of css. means don't react in same way e.g. <div> would. this isn't specific flexbox -- e.g. don't render scrollbars if put "overflow:scroll" on button, , don't render table if put "display:table" on it. stepping further, isn't specific <button> . consider <fieldset> , <table> have special rendering behavior: data:text/html,<fieldset style="d
Read more

html - Missing border-right in select on Firefox -

-
Image
when put select div width , padding-left, options have no border on right. more, happend if select have width 118px , parent have 15px of padding left! have idea, going on? my code: <!doctype html> <html> <head lang="en"> </head> <body> <div style="width: 1000px; padding-left: 15px;"> <select style="width: 118px;"> <option>a</option> <option>b</option> <option>c</option> </select> </div> </body> </html> and result: here plunker: click it happend on firefox on windows. tested on 40.0.2 version -webkit-box-sizing: border-box; -moz-box-sizing: border-box; -ms-box-sizing: border-box; box-sizing: border-box; source: https://stackoverflow.com/a/11390432/4431269 source of problem: https://bugzilla.mozilla.org/show_bug.cgi?id=924068 and use of google ! edit: (source of problem, explained) after rea
Read more

c# - two queries in same method -

-
i trying execute 2 queries in same method gives me exception. can red of exception declaring new command there way use same command? string id="hi"; connection.open(); oledbcommand command1 = new oledbcommand(); command1.connection = connection; string query1 = "select * products category='" + combobox1.text + "' , subcategory = '" + combobox2.text + "' , sizes='" + combobox3.text + "'"; command1.commandtext = query1; oledbdatareader reader = command1.executereader(); while (reader.read()) { id = reader[0].tostring(); } textbox1.text = id; string query = "insert category_in (category_id,amount,amount_in) values ('"+ id+"' ,500,300)"; command1.commandtext = query; command1.executenonquery(); messagebox.show("saved"); connection.close();
Read more