svn - Using version control to keep multiple code branches up to date -

-


svn - Using version control to keep multiple code branches up to date -

i'm hoping able help me improve understand version command in scenario. we're thinking of either implementing visualsvn or mercurial, want our strategy figured-out first.

i'm part of 2 man development team working on porting , maintaining bespoke cms system. we're looking maintain "stable" branch, , each have our own dev branches required.

where we're not sure each client requires own customisations (templates, stylesheets, etc). i'd expect these branches stable. ideally we'd way ensure changes made stable (such merging dev branch in or adding hot-fix) pushed out client branches.

is there way ensure these client branches automatically brought forwards recent changeset ?

can take exclude files (such *.css) getting pushed client branches after initial branch operation ?

looking @ you'd able go each client branch , pull stable, merging latest changes in. in event end lots of client branches, there improve way ?

i've found questions seem offer advice

using version command non-hierarchical code?

practical way commit changes in source command multiple branches

version command multiple instances of developing code

how maintain branches date 'default' branch under mercurial?

apologies if i'm coming @ backwards, suggestions appreciated.

is there way ensure these client branches automatically brought forwards recent changeset ?

you going branch, pulling stable , merging.

can take exclude files (such *.css) getting pushed client branches after initial branch operation ?

no, don't exclude files when merge. should instead construction files have base of operations file — phone call base.css — , have client.css additional style sheet. way can override things base.css in client.css needed and latest version of base.css when merge stable branch.

you can utilize same scheme other files need alter on per-client basis: configuration files , themes.

looking @ you'd able go each client branch , pull stable, merging latest changes in. in event end lots of client branches, there improve way ?

nope, that's way works. can of course of study script create more convenient , cut down risk of errors.

svn version-control mercurial branch dvcs

Comments

Post a Comment

Popular posts from this blog

How do I check if an insert was successful with MySQLdb in Python? -

-
How do I check if an insert was successful with MySQLdb in Python? - i have code: cursor = conn.cursor() cursor.execute(("insert new_files (videos_id, filename, " "is_processing) values (%s,%s,1)"), (id, filename)) logging.warn("%d", cursor.rowcount) if (cursor.rowcount == 1): logging.info("inserted values %d, %s", id, filename) else: logging.warn("failed insert values %d, %s", id, filename) cursor.close() fun is, cursor.rowcount always one, though updated database create videos_id unique key. is, insert fails because in tests same videos_id going appear (and when check database, nil inserted). whatever reason, rowcount 1 - logging.warn have spits out rowcount of 1. so, question: can utilize rowcount work out if insert went fine? if so, (presumably) doing wrong? otherwise, how check if insert went fine? your code not commit after modifications (your modifications rolled back). should...
Read more

delphi - blogger via idHTTP : error 400 bad request -

-
delphi - blogger via idHTTP : error 400 bad request - i'm trying post blogger using idhttp component, however, i'm getting "http/1.0 400 bad request" error. procedure tform1.button1click(sender: tobject); var request,response,req : tstringlist; auth,blogid : string; begin blogid := '00000000000000000000000'; request := tstringlist.create; response := tstringlist.create; req := tstringlist.create; idhttp1.request.connection := 'keep-alive'; idhttp1.request.contenttype := 'application/x-www-form-urlencoded'; idssliohandlersocket1.ssloptions.method := sslvsslv23; request.clear(); request.values['accounttype'] := 'google'; request.values['email'] := 'xxx@gmail.com'; request.values['passwd'] := 'yyy'; request.values['service'] := 'blogger'; response.text :=idhttp1.post('https://www.google.com/accounts/clientlogin',request); auth := resp...
Read more

postgresql - ERROR: operator is not unique: unknown + unknown -

-
postgresql - ERROR: operator is not unique: unknown + unknown - i have postgis database , have compute new values rows in new column. these values should average of values of several columns. query: insert bdps (da_m) values (avg('da_1'+'da_2'+'da_3'+'da_4'+'da_5'+'da_6'+'da_7')); in query bdps database, da_m new column , da_1 da_7 existing columns have double precision type. da_m created using alter table bdps add together column da_m double precision; i next error: error: operator not unique: unknown + unknown line 2: values (avg('da_1'+'da_2'+'da_3'+'da_4'+'da_5'+'da_6'+'da_7... ^ hint: not take best candidate operator. might need add together explicit type casts. ********** error ********** error: operator not unique: unknown + unknown sql state: 42725 hint: not take best candidate operator. might need add togethe...
Read more