mercurial - Best way to manage Source Control for slightly different versions of the same codebase -

-

i've seen question asked several different ways , each time, answers workarounds or ways not have maintain 2 or more different versions. however, don't think there workarounds given environment (visual foxpro). maintain 2 different repositories:

  • live - code in production
  • proof - identical live testing ground of number of new features staging area changes live

i don't see way handle situation branches because proof spends (if not all) of it's time looking more fork. example, there large section of code drastically different live we've been toying around year now. there's 10 minor features different live in various stages of approval.

there lots of days when i'm diff'ing , merging between 2 repositories ask myself, why can't branches of same codebase. don't see how that's possible. proof living breathing thing of it's own need able compile , maintain separately live (though realize there's nothing in last statement precludes single codebase, dilemma).

am right proof more of fork , therefore has maintained in separate repository?

btw, not matters question, vcs of choice mercurial.

the way in shop use default , stable branches keep code released (live) separate stuff being worked on.

in addition named branches, have clone each new feature/addition substantial. we're bit more comfortable having multiple heads on default branch.

keeping state of code has been released production in own named branch helps eliminate accidents. instead of being able mess live repo pushing isn't ready, have explicitly merge changes on live branch.


Comments

Post a Comment

Popular posts from this blog

c# - How to set Z index when using WPF DrawingContext? -

-
how set z-index drawing object when using drawingcontext.drawxxx() methods? the object drawn last have higher z index. can't change index of drawn objects. way draw in order. if using wpf (as placed tag), can use, example, canvas control. create shapes need like polyline obj = new polyline(); //... // ... set properties of obj and add them canvas uielementcollection: yourcanvasname.children.add(obj); //or yourcanvasname.children.insert(i, obj); first items of collection have higher z index. advantages in way: no need redraw on window changes, can anytime move objects , change order.
Read more

razor - Is this a bug in WebMatrix PageData? -

-
i think may have found bug in webmatrix's pagedata, not sure. concerns how pass data partial page calling page. in webmatrix documentation (tutorials, e.g. " 3 - creating consistent look ", , example code), pagedata recommended mechanism pass data between pages (e.g. content page layout page, or partial page). however have found not work other way, pass data partial page calling page. modifying or adding entries in pagedata in partial page, not seem calling page. cutting right down simplest possible example, in test page may have this: @{ pagedata["test"] = "initial entry"; } <p>before calling partial page, test value @pagedata["test"]</p> @renderpage("_testpartial.cshtml") <p>after returning calling page, test value @pagedata["test"]</p> and in _testpartial.cshtml page might have this: @{ pagedata["test"] = "modified entry"; } <p>in partial page...
Read more

visual c++ - Using relative values in array sorting ( asm ) -

-
i need sort through array , sort each individual row in array in ascending order. doesn't seem going (surprise!) keep getting hit 2 errors: a2101: cannot add 2 relocatable labels , a2026: constant expected here's sort, makes sense me, think i'm still trying implement high-lvl language techniqes assembly. there way around not being able use relative values? (the array 7 rows 9 columns, btw). mov cx, 7; cx = number of rows outer: ; outer loop walk through rows push cx mov cx, 9 mov row, cx ;rows middle: ; middle-loop walk through columns push cx sub cx, 1 ;cx = cx-1 mov column, cx ;columns inner: ;inner loop - compare , exchange column values cmp marray[row*9 + column], marray[row*9 + column+1] xchg marray[row*9 + column+1], marray[row*9 + column] ; compare , exchange values marray table inc column loop inner pop cx loop mid...
Read more