deployment - Managing software with custom local patches -

-

i'm trying find way deploy software custom patches in production. base software opensource own repos (svn) , we've got patches select 1 service , not other (so we've got base+patcha+patchb on 1 server , base+patcha+patchc on another).

everything deployed packages, pretty simple. issue i'm thinking is: how store modifications? these ways thought about:

  • i've tried using quilt / patch series + downloading specific revision upstream when building. works well, until need port patches new version. since quilt needs copy of tree patch modifications, takes long time fix stuff. also, having different versions deployed on different servers means need have different build-scripts.
  • i clone repository local git/hg , create branch local modifications. that's great porting patches forwards , can make local release tags on branch, unfortunately lose information separate patches. can see diff upstream of course, lose clear separation of different local modifications.
  • i tried stacked git / hg-mq, far can see, don't export patch series easily. they're storing work in progress. can same trick bitbucket , create patch queues "inside repository" export them, every patch queue assigned branch separately (same modification needed in every local branch uses patcha example).

do have other ideas, articles, standardised ways of doing this? additional pros & cons ways mentioned?

i know it's long time since asked, had answer right here:

i clone repository local git/hg , create branch local modifications. that's great porting patches forwards , can make local release tags on branch, unfortunately lose information separate patches. can see diff upstream of course, lose clear separation of different local modifications.

you still clear separation of different local modifications through git's "commit" mechanism.

the way see it, git "commit" same thing patch sent email. is, encapsulates single change subject line , descriptive body text explaining reason change. of course, contains changes relevant files.

the git format-patch command (and cousin, git send-email) output in format if need send changes outside system (eg, upstream), information there anyway.


Comments

Post a Comment

Popular posts from this blog

c++ - How do I get a multi line tooltip in MFC -

-
right now, have tool tip pops when hover on edit box. problem tool tip contains multiple error messages , in 1 long line. need have each error message on own line. error messages contained in cstring new line seperating them. my existing code below. bool ontooltiptext(uint, nmhdr* pnmhdr, lresult* presult) { assert(pnmhdr->code == ttn_needtexta || pnmhdr->code == ttn_needtextw); // need handle both ansi , unicode versions of message tooltiptexta* pttta = (tooltiptexta*)pnmhdr; tooltiptextw* ptttw = (tooltiptextw*)pnmhdr; // tchar szfulltext[256]; cstring strtiptext=_t(""); uint nid = pnmhdr->idfrom; if (pnmhdr->code == ttn_needtexta && (pttta->uflags & ttf_idishwnd) || pnmhdr->code == ttn_needtextw && (ptttw->uflags & ttf_idishwnd)) { // idfrom hwnd of tool nid = ::getdlgctrlid((hwnd)nid); } //m_errprojaccel[ch] contains 1 or more error messages each...
Read more

asp.net - In javascript how to find the height and width -

-
i having .aspx , masterpage page. in masterpage loading aspx page . in aspx page design using generating table structure using code-behind server in javascript how find height , width . regards, kumar if you're looking table height , width, should it var tbl = document.getelementbyid('tbldemo'); alert(tbl.offsetwidth + '\n' + tbl.offsetheight);
Read more

c# - DataTable to EnumerableRowCollection -

-
i have datatable according client requirement can contain invalid date "00/00/1999",null,empty string.(typed datset) when collect them enumerables wish convert of invalid forms empty string. (i.e) enumerablerowcollection<datarow> query = order in _table.asenumerable() select new { orderdate= string.isnullorempty(convert.tostring(order.field<datetime>("orderdate")) || (how check date invalid date) ? string.empty : order.field<datetime>("orderdate") } how check whether date valid date or not? datetime.tryparse...like given current code: datetime date; enumerablerowcollection<datarow> query = order in _table.asenumerable() select new { orderdate= string.isnullorempty(convert.tostring(order.field<datetime>("orderdate")) || !datetime.tryparse(convert.tostring(order.field<datetime...
Read more