Does merge direction matter in Mercurial? -

-

take simple example: i'm working on default branch, have changesets committed locally, , pulled few more master repository. i've been working few days in isolated local repository, there's quite few changes merge before can push results master.

default ---o-o-o-o-o-o-o-o-o-o-o  (pulled stuff)             \              o----o------------o  (my stuff)

i can 2 things now.

option #1:

hg pull hg merge

result #1:

default ---o-o-o-o-o-o-o-o-o-o-o             \                   \              o----o------------o-o

option #2:

hg pull hg update hg merge

result #2:

default ---o-o-o-o-o-o-o-o-o-o-o-o             \                   /              o----o------------o

these 2 results isomorphic me, in practice seems option #2 results in way smaller changesets (because applies few changes mainline instead of applying mainline changes few).

my question is: matter? should care direction of merges? saving space if this? (doing hg log --patch --rev tip after merge suggests so.)

they're (effectively) identical. see difference in hg log --patch --rev x output size because log shows diff of result , (arbitrarily) 'left' parent (officially p1), that's not how it's stored (mercurial has binary diff storage format isn't patch/diff based) , it's how it's computed (p1, p2, , most-recent-common-ancestor used).

the real difference is, if you're using named branches, branch name of left parent.


Comments

Post a Comment

Popular posts from this blog

python - Scipy curvefit RuntimeError:Optimal parameters not found: Number of calls to function has reached maxfev = 1000 -

-
Image
i want make logharitmic fit. keep getting runtime error: optimal parameters not found: number of calls function has reached maxfev = 1000 i use following script. can tell me go wrong? use spyder still beginner. import math import matplotlib mpl scipy.optimize import curve_fit import numpy np #data f1=[735.0,696.0,690.0,683.0,680.0,678.0,679.0,675.0,671.0,669.0,668.0,664.0,664.0] t1=[1,90000.0,178200.0,421200.0,505800.0,592200.0,768600.0,1036800.0,1371600.0,1630800.0,1715400.0,2345400.0,2409012.0] f1n=np.array(f1) t1n=np.array(t1) plt.plot(t1,f1,'ro',label="original data") # curvefit def func(t,a,b): return a+b*np.log(t) t=np.linspace(0,3600*24*28,13) popt, pcov = curve_fit(func, t, f1n, maxfev=1000) plt.plot(t, func(t, *popt), label="fitted curve") plt.legend(loc='upper left') plt.show() your original data t1 , f1 . therefore curve_fit should given t1 second argument, not t . popt, pcov = curve_fit(func,
Read more

c# - How to add a new treeview at the selected node? -

-
i have treeview 4 levels; parent, child, grandchild, great-grandchild. selectednode @ grandchild level. what i'm trying create new "treeview" @ grandchild - no, dont wnat create new node "selectednode" (grandchild). should somelike this: parent child grandchild (new treeview) parent grandchild great-grandchild child great-grandchild child grandchild grandchild it similar parent table mother , father went off , had new childern different spouse other spouse of there existing children. private sub populaterootlevel() ' query find first round of parent populatenodes(dt, jcatreeview.nodes) end sub private sub populatenodes(byval dt datatable, byval nodes treenodecollection) each dr datarow in dt.rows dim tn new treenode() tn.text = dr("title").tostring()
Read more

java - netbeans "Please wait - classpath scanning in progress..." -

-
when try compile netbeans projects message/error : "please wait - classpath scanning in progress..." and nothing happens , have have wait enternity conmpile "hello world"... now first thing have moved new office building, laptop same. it's secure enviroment lot of "security", can't connect anywhere almost. have changed user dir in netbeans.conf save data in c:\program files\user any ideas how fix this? alrady tried reinstalling netbeans, changing save location between standart , newone... just ideas find problem look @ cpu - netbeans busy (100% on 1 core) or blocking (95% idle)? standard, ant or maven build? libraries , use absolute or relative paths? start simple "hello world" project (no dependencies), add 1 lib (log4j or similiar), located in project folder , - if works - move lib other locations (choose locations similiar libs on real classpath) there chance, don't have access rights folders/shares conta
Read more