Any Way I Can Easily Merge Git Branches Created in CVS2Git Migration? -


we did migration of our cvs repository git.

in our cvs repository, had branches code in them had stashed away after development complete, until had time schedule them @ later point.

when did migration using cvs2git, resulted in branches getting carried on git repo, way worked files had been branched in cvs appeared in git branch.

so example, if had following file/folder tree in cvs on head:

lib    -com       -example          -folder1             -file1a             -file1b          -folder2             -file2a             -file2b

and branched "file1a" , "file2b" files on branch_cool_feature branch in cvs, resulting "branch_cool_feature" branch in git contains "file1a" , "file2b" files.

i'm looking easiest way identify files involved in cvs branch i'd want merge in, including point branched in cvs know diff merge in, , automatically merge.

this best i've got far, hoping there better way:

1) git diff --name-status on master , branch_cool_feature diff-filter set m identify files modified in branch, or take full list of files in branch 2) each of files, @ cvs history , correlate timestamps identify 2 generated git commits file represent diff merged 3) run git merge on specific file , specify 2 commits diff merge in

appreciate help, thanks!

-git newbie

p.s. don't have ton of details on how actual cvs2git conversion run, if it's important can hold of it.

is there way easily


Comments

Post a Comment

Popular posts from this blog

angularjs - ADAL JS Angular- WebAPI add a new role claim to the token -

i have created angular spa webapi backend using adal js authentication.as there no roles in ad, need manually add role claims in order give users access different api controllers. the roles stored in database. expecting inject claim through call webapi after authentication ad. webapi code might this. identity.addclaim(new claim("role", "user")); var ticket = new authenticationticket(identity, props); var accesstoken = startup.oauthbeareroptions.accesstokenformat.protect(ticket); is possible replace adal idtoken new token? is viable solution or there other better way handle this? as initial token generated azuread, possible edit token add new claim? appreciated. graph api supporting group claims. see here: http://justazure.com/azure-active-directory-part-4-group-claims/ if @ examples on page, users assigned groups , app can check group in claims. in current version of portal, need app manifest , modify it.
Read more

php - CakePHP HttpSockets send array of paramms -

i problem when make request (i can request). $link = 'http://uri/path/?param1=1&sid=2&sid=3&sid=4' $http = $httpsocket = new httpsocket(); $res = $httpsocket->get($link); if check request pr($http); i see : [line] => /url/path/?param1=1&sid%5b0%5d=2&sid%5b1%5d=3&sid%5b2%5d=4 http/1.1 and i'm getting empty response because server doesn't know parameters sid%5b0%5d=2 when try send parameters array : $data = array('param1' => '1', 'sid' => array('2','3', '4')); i see same changes %5b0%5d - additional indexes. how fix it? unfortunately , can not change server side, if send request in browser, i'll normal response in json format. when make request, can parameters this: $param1 = $_get['param1']; $sid= $_get['sid']; tip: use diferente names parameters. have multiples sid. use sid1, sid2, sid3... update: can parameters this:
Read more

node.js - Using Node without global install -

i'm working on few node & electron (atom shell) projects , i'm curious how them work without user having install node globally. i've seen few applications including node directory in project contains node.exe binary. how go setting node project use binary? edit: thought should add, i've searched everywhere answer this, unrelated results.
Read more