version control - svn local obstruction, incoming add upon merge -


i have read quite few threads on , following blogg still don't understand particular issue hope can help...

doing merge mainline dev line catch again , following tree conflict.

m      incubator      c incubator/utilityscripts      >   local dir obstruction, incoming dir add upon merge

okay, understand should directory independently added both trunk , dev branch independently such there no common ancestor...

..buuuut (there's right?!) there common ancestor. directory entered dev branch because of previous merge truck.

dev$ svn mergeinfo {^/trunk/src/,}incubator/utilityscripts/      youngest common ancestor      |         last full merge      |         |        tip of branch      |         |        |         repository path       23788              23838         |                  |           -------| |------------         trunk/src/incubator/utilityscripts       \                                 \                                --| |------------          branches/dev/src/incubator/utilityscripts                          |                                23838

so, understand svn believe dev branch ancestrally related trunk common ancestor @ revision 23788.

branch$ svn log --stop-on-copy incubator/utilityscripts/ ------------------------------------------------------------------------ r23790 | me | 2015-05-12 16:08:25 +0100 (tue, 12 may 2015) | 1 line

so got file in revision 23790 , @ revision 23838

trunk$ svn log --stop-on-copy incubator/utilityscripts/ ------------------------------------------------------------------------ r23639 | | 2015-03-06 10:59:10 +0000 (fri, 06 mar 2015) | 1 line

so, common ancestor 23788. revision @ entered dev branch 23790 after anyway.the recent trunk change 23639 before of these.

so given this, how on earth can there incoming add conflict?!


Comments

Post a Comment

Popular posts from this blog

Email notification in google apps script -

https://support.google.com/docs/answer/91588?hl=en i have sheet the cells filled in data pulled via apps script, website. pull in exact same data, not. on old sheets version use able emails when data "changes" different value. new sheets, email when new data pasted cells, though exact same data......and, can't set @ ranges anymore, entire document. there easy way watch cells when data changes, , email myself? this looks lot you're trying do. for checking whether value has changed after edit, this gives necessary information it. hence, know whether new value same 1 or not. implementing "workaround" talked in second link, able compare , send email myself if value changed. initiate onedit trigger goes off onedit function uses these lines after checks in place have passed. var email = "xyz@whatever.com"; mailapp.sendemail(email, "triggermail", "a change has occurred in sheet"); note: sends "notification...
Read more

c++ - Difference between pre and post decrement in recursive function argument -

i have following sample code used pre-decrement void function(int c) { if(c == 0) { return; } else { cout << "dp" << c << endl; function(--c); cout << c << endl; return; } } this function give output input 4 : dp3 dp2 dp1 dp0 0 1 2 3 but when use post decrement void function(int c) { if(c == 0) { return; } else { cout << "dp" << c << endl; function(c--); cout << c << endl; return; } } output goes in infinite loop dp4 can explain me in detail why happens ? this happens because function(c--) called same value of c , when finishes c decremented. recursively called, hence called same value no chance of return , hit stack overflow error. assume this, int x = 1, y = 0; y = x++ result y == 1 , x == 2. if y = ++x , bot x , y 2.
Read more

javascript - IE11 incompatibility with jQuery's 'readonly'? -

the code i'm running has no issues in firefox, or chrome. user typing 1 textbox, tabs next , can continue typing that. when run webpage on ie11, user tabs next textbox , can't type in. textbox has double-clicked before user can insert anything. i've googled , seems ie give problems when using older jquery (i.e. prefers 'prop' 'attr' ). in code below jquery's readonly keyword being used in way ie11 no longer recognise/accept? i assume issue readonly , removeclass('ignore') working expected. //when focus on textbox 1 $("#field1").focus(function() { //remove readonly property textbox 1 $('#field1').prop('readonly', false).removeclass('ignore'); //add readonly property other textboxes $('#field2, #field3, #field4') .prop('readonly', 'readonly').addclass('ignore').val(''); }); i'm using jquery 2.1.3 ...
Read more