Simple mercurial webdev repo setup: features vs. fixes -


i have inherited mercurial system basic web site, i’m new mercurial , temporary site babysitter until find lot more competent me. in meanwhile, use pointers on how can keep our feature development separate quick bug fixes.

currently, have 3 basic environments: individual developer environments, staging, , production. each environment has own local mercurial repo. single bitbucket repo acts master repo every environment pushes , pulls from.

the problem when working on code unfinished needs submit quick bug fix needs deployed quickly. if developer has committed changes unfinished code , commits quick bug fix , push, code goes bitbucket repo.

judging i’ve researched far, can development bitbucket repo (for slower development) , “stable” bitbucket repo (for fixes need happen now)

in situation, on our dev machines, we’d of our slower dev code in our local dev repo cloned local stable repo. when wanted share unfinished code, we’d push/pull bitbucket dev. other developers push/pull local dev bitbucket dev keep local dev environments in sync or merge code.

when we’re ready push production, we’d push code our dev environment bitbucket main , pull staging testing. if looked good, we’d pull bitbucket main repo production. later, we’d pull bitbucket main repo our personal stable repos keep them in sync , pull personal main repo personal dev repo in sync.

if we’re in middle of incomplete code in our dev environments have make bug fixes quickly. we’d bugfix in our personal stable repos should free of incomplete code, push local repo bitbucket stable, , pull production. we’d pull bitbucket stable our personal dev environments keep in sync production still preserving our unfinished code.

it feels there’s simpler way of doing i’m not understanding. advice appreciated.

the problem when working on code unfinished needs submit quick bug fix needs deployed quickly.

this question of used workflow , (missing) management, sorry. see @ least 3 weak points in current state

  • (unrelated) why 3 repos instead of single repo special named branches?
  • why, switching task workstyle, mq extension not used mandatory tool?
  • why development happens in default branch , named branches not used?

i, pm in situation evaluate 2 possible ways , implement after testing of (or combination of both)

  • mq extension single-branch mode must used any wip. finished , tested changes can converted changeset(s) (and, thus, can pushed public)
  • single-branch mode replaced "branch per task" workflow (any task - new named branch in developer's repo, merged later default) , default push-mode "all branches" replaced "push specified branches": ...-b default in case of separated repos, -b default -b staging -b prod in case of single repo separate branches per target /devel, staging, prod/. in case of -b selected branches , parents of changesets in these branches named branches (i.e merged branches) pushed public, unfinished (and not merged) branches stay local

Comments

Post a Comment

Popular posts from this blog

SPSS keyboard combination alters encoding -

my question not have programming practical issue on spss. accident keyword combination cannot remember because did not intend press changed encoding in spss , text in data in different language english shown small boxes. nevertheless, when kind of analysis performed different language text shown in output. does know reason? tried change encoding did not produce result. first, @ edit > options , see whether setting unicode or locale. might fix it. if have text in multiple languages, want unicode. otherwise, may have specific locale set wrong. can change set locale, need know locale want use.
Read more

Add new record to the table by click on the button in Microsoft Access -

in ms access form want implement separate button, adds new record table. in order added button , attached button event: private sub btnaddrec_click() refresh codecontextobject on error resume next docmd.gotorecord , , acnewrec if err.number <> 0 btnaddrec.enabled = false end if end end sub everything ok when open window , click btnaddrec button, problem when first of perform navigation through existed records , after click on button. got runtime error: 2105: «you can't go specified record. may @ end of recordset» . how solve issue, need have ability add new record on click on specific button, no matter, have walked or not walked through records before. thanks. i created simple form field call description (and autonumber) , created button code follows click event. filled number of records , navigated through them, clicked addnewrec button. form navigated new record without issues. able click addnewrec button directly after
Read more

javascript - jQuery .height() return 0 when visible but non-0 when hidden -

i have problem here right opposite others: in jquery cannot height of element when it's visible, when hidden. have html code: <div id="filtering-filter-holder"> <div id="filtering-filter-holder-inner"></div> </div> basic css it: #filtering-filter-holder { display: none; position: absolute; width: 420px; min-height: 100px; padding: 5px 5px 5px 5px; background-color: #ffffff; border: 1px solid #164372; } and finally, js in document.ready(): $('div.filtering-filter-headline').mouseenter(function() { var el = $(this).parent().find('div.filtering-filter-content'); if ($('div#filtering-filter-holder').is(':visible')) { $('div#filtering-filter-holder-inner').stop(true, true).fadeout(300, function() { $('div#filtering-filter-holder-inner').html($(el).html()); var height = $('div#filtering-filter-holder-inner&#
Read more