Merge problems in mercurial because of wrong merge base: what's happening? -



Merge problems in mercurial because of wrong merge base: what's happening? -

i have repository in 2 revisions (14321 , 14319) share parent (14318) - both changesets direct children of 14318. nevertheless, revision set query ancestor(14321, 14319) not homecoming 14318, instead returns much older changeset. what's happening?

screenshot in tortoisehg:

background: encountered odd merge conflicts turned out caused mercurial trying re-apply changes had been merged. able track downwards odd selection of merge base of operations caused both heads include same changes - don't understand why happened , how can prevent in future (i chose dvcs partly avoid these kinds of problems in first place...)

the image shows there not 1 2 mutual ancestors. so, looks criss-cross merge case merge problems arise chosing 1 or mutual ancestor.

references:

http://bz.selenic.com/show_bug.cgi?id=1327#c18 http://www.gelato.unsw.edu.au/archives/git/0504/2279.html http://wiki.vestasys.org/mergingfuture/food4thought/trickycases http://revctrl.org/crisscrossmerge?action=recall&rev=11 http://bz.selenic.com/show_bug.cgi?id=1327#c18

there proposal new merge algorithm (http://mercurial.selenic.com/wiki/consensusmerge). however, since mercurial's 2.3 sprint topic stuck.

to cut down kind of problem, suggest estabilish client-server topology, developers merge official repository. maybe rebase help also.

a criss-cross merge this:

b --- d / \ / \ / \ / \ x f \ / \ / \ / \ / c --- e

in case, was:

b -----------o---- } stable/production c \ \ f ------o------o---\------o } default \ d \ / -----------o--- } feature e = ? b = 14318 c = 14294 d = 14319 e = 14321 f = ?

to produce f, there 2 possible circuits: b-d-e-f , c-d-e-f. mercurial has chosen latter.

you have avoided criss-cross if haven't merged production , feature branches. hotfix have been propagated feature branch via default branch. log be:

b -----------o } stable/production c \ f ------o------o------o } default \ d \ / -------o--- } feature e

mercurial merge ancestor

Comments

Post a Comment

Popular posts from this blog

web services - java.lang.NoClassDefFoundError: Could not initialize class net.sf.cglib.proxy.Enhancer -

web services - java.lang.NoClassDefFoundError: Could not initialize class net.sf.cglib.proxy.Enhancer - when trying request rest service @ time of response getting exception.. feb 21, 2013 2:34:49 pm com.sun.jersey.spi.container.containerresponse mapmappablecontainerexception severe: exception contained within mappablecontainerexception not mapped response, re-throwing http container java.lang.noclassdeffounderror: not initialize class net.sf.cglib.proxy.enhancer @ org.hibernate.proxy.pojo.cglib.cgliblazyinitializer.getproxyfactory(cgliblazyinitializer.java:117) @ org.hibernate.proxy.pojo.cglib.cglibproxyfactory.postinstantiate(cglibproxyfactory.java:43) @ org.hibernate.tuple.entity.pojoentitytuplizer.buildproxyfactory(pojoentitytuplizer.java:162) @ org.hibernate.tuple.entity.abstractentitytuplizer.<init>(abstractentitytuplizer.java:135) @ org.hibernate.tuple.entity.pojoentitytuplizer.<init>(pojoentitytuplizer.java:55) @ org.hibernate.tuple.e...
Read more

Accessing MATLAB's unicode strings from C -

Accessing MATLAB's unicode strings from C - how can access underlying unicode info of matlab strings through matlab engine or mex c interfaces? here's example. let's set unicode characters in utf-8 encoded file test.txt, read as fid=fopen('test.txt','r','l','utf-8'); s=fscanf(fid, '%s') in matlab. now if first feature('defaultcharacterset', 'utf-8') , c engevalstring(ep, "s") , output text file utf-8. proves matlab stores unicode internally. if mxarraytostring(enggetvariable(ep, "s")) , unicode2native(s, 'latin-1') give me in matlab: non-latin-1 characters replaced character code 26. need getting access underlying unicode info c string in unicode format (utf-8, utf-16, etc.), , preserving non-latin-1 characters. is possible? my platform os x, matlab r2012b. addendum: documentation explicitly states "[mxarraytostring()] supports multibyte encoded characters...
Read more

javascript - mongodb won't find my schema method in nested container -

javascript - mongodb won't find my schema method in nested container - i trying access method of schema stored within mixed container. here situation : have cases model can many different things, have schema each of these things stored in "casecontent" mixed property. var caseschema = mongoose.schema({ casecontent : {}, object : {type:string, default : "null"}, collision : {type : boolean, default : false} }); the casecontent property filled model of 1 of schemas, 1 exemple : var treeschema = new mongoose.schema({ applecount : {type : number, default : 3} }); treeschema.methods.dostuff = function (data) { console.log('hey, listen'); homecoming true; }; then, want utilize method of schema original container : caseschema.methods.dostuff = function (data) { if (this.casecontent.dostuff !== undefined) { this.casecontent.dostuff(); console.log('it worked'); } else { ...
Read more