perforce - How to integrate 2 branches programatically -


i have 2 branches in depot.

  //depot/project/mainline/...   //depot/project/staging/...

i using in-house tool manages build of project, , create build step automatically promotes files mainline staging. have been trying write using p4.net api, following following example. able run powershell commands build tool. plan write c# console application, compile using tool, , execute build step. unfortunately getting example. able create client, create branch spec , sync files down, life of me cant figure out how submit integrate. feel trying over-engineer solution thought. should easy do. attaching broken code below. if dose not make sense, because using trial , error figure stuff out , didn't make final pass through yet. said, if don't need use p4 api, better. requirement there no user input required run commands. if there merge conflict, want automatically accept source.

thanks

        string uri = "server";         string user = "user";         string pass = null;         string ws_client = "project-temp-"+ guid.newguid().tostring();           server server = new server(new serveraddress(uri));         repository rep = new repository(server);         connection con = rep.connection;          con.username = user;         con.client = new client();         con.client.name = ws_client;         con.client.viewmap = new viewmap();          con.connect(null);         credential cred = con.login(pass, null, null);         rep.deleteclient(con.client, null);         rep.createclient(con.client);         con.client.viewmap.clear();         con.client.viewmap.add("//depot/project/...", string.format("//{0}/...", con.client.name), maptype.include);         rep.updateclient(con.client);          var files = con.client.syncfiles(new syncfilescmdoptions(syncfilescmdflags.none, -1));          viewmap vm = new viewmap();         vm.add(new mapentry(maptype.include,new clientpath("//depot/project/mainline/..."), new clientpath("//depot/project/staging/...")));         string msg = "mainline staging";         branchspec bs = new branchspec("project-temp", user, datetime.now, datetime.now, msg, true, vm, null, null);         int change = -1;         integratefilescmdoptions branchoptions = new integratefilescmdoptions(integratefilescmdflags.none, change, -1, "project-temp", null, null);         rep.createbranchspec(bs);         rep.updateclient(con.client);           var integrated = con.client.integratefiles(branchoptions);         con.client.resolvefiles(files, new resolvecmdoptions(resolvefilescmdflags.automaticyoursmode, change));           rep.deleteclient(con.client, null);

from command line is:

p4 integrate //depot/project/mainline/... //depot/project/staging/... p4 resolve -am p4 resolve -at p4 resolve -ay p4 submit -d "integrate."

the "resolve -am" automerges files without conflicts. "resolve -at" accepts source of remaining files. on off chance there source files can't accepted (e.g. source revisions have been obliterated, or source , target actions incompatible), "resolve -ay" ignores them.


Comments

Post a Comment

Popular posts from this blog

html - Outlook 2010 Anchor (url/address/link) -

i'm trying link specific pdf page msoutlook'10 or msword'10, #page=... anchor particularly useful , works fine elsewhere. unfortunately when click [ctr-k] in outlook or winword, links re-formatted assuming unc path. pdf file located on shared drive. using "file:" prefix links open pdf in adobe reader (outside of browser), , "http:" open inside browser. issue seem need open in browser "file:" prefix in order anchor work. know anchors work inside browser. outlook uses windows/explorer default program (based on file extension) seems open in adobe reader neglecting anchor. is aware of solution, link specific page or bookmark of shared-pdf ms outlook and/or winword link? common references: mailermailer.com/...anchor-tags-html-emails campaignmonitor.com/...anchor-links-in-email-newsletters/ stackoverflow.com/...anchor-in-pdf-document
Read more

javascript - Why does running this loop 9 times take 100x longer than running it 8 times? -

consider code: test = function() { } t = new test(); (var = 0; < 8; i++) { result = t instanceof test; } if change number of iterations 8 9 , loop take 100 times longer complete in latest version of firefox (41.0.1). tested on 2 different pcs , magic limit 8. here jsperf test used: http://jsperf.com/instanceof-8-times-vs-9-times does have idea why might happen? seems specific instanceof . not happen if else object, example check property. note: filed bugzilla bug this. jan de mooij mozilla team has posted details in bugzilla thread . here's simplistic interpretation of highly technical answers: in i < 8 case, firefox smart enough hoist result = t instanceof test; statement out of loop (according tests, doesn't seem omit altogether). in i < 9 case, apparently doesn't optimization . why? reason not clear, related fact 9 iterations threshold above function considered "hot" enough run through jit compiler. i < 8 cas...
Read more

Getting gateway time-out Rails app with Nginx + Puma running on Digital Ocean -

following this guide setup app on digital ocean droplet, not working. site not loading , it's throwing: "gateway time-out". the puma server works, since ps aux | grep puma prints: root 15878 0.0 0.4 376832 2168 ? sl 12:50 0:00 puma 2.13.4 (unix:///var/www/myapp/shared/tmp/sockets/myapp-puma.sock) [20150930164940] root 15881 0.0 0.7 903676 3692 ? sl 12:50 0:06 puma: cluster worker 0: 15878 [20150930164940] root 24654 0.0 0.1 11748 916 pts/2 s+ 18:00 0:00 grep --color=auto puma my nginx config: user root; worker_processes 1; events { worker_connections 1024; } http { upstream puma { server unix:///var/www/myapp/shared/tmp/sockets/myapp-puma.sock; } server { listen 80; server_name myapp.com; root /var/www/myapp/current/public; access_log /var/www/myapp/current/log/access.log; error_log /...
Read more