git svn - Which layout to use for git-svn in a project with standard layout currently and non standard layout in past -

-

should use standard layout param (-s) git svn when our subversion repository adheres standard layout although not case of history?

i'm trying import subversion repository git while history.

more details

first few years main project folders in root instead of trunk folder

/ - project folders in root   '- e.g. apps   '- components /branches /tags /trunk - empty

after many years migration branch introduced , used few additional years

/ - project folders in root   '- e.g. apps   '- components /branches   '- migration - long living branch used main project work time       '- e.g. apps       '- components   '- few other branches (<3) /tags   '- many tags releases

for past 1 year current state conforms standard layout

/ - no files, no folders in root (except trunk, branches, tags) /branches   '- oldmigration - migration branch renamed (moved)       '- e.g. apps       '- components   '- few other branches (<5)   '- oldroot - folders root moved here /tags   '- around 150 tags releases /trunk   '- e.g. apps   '- components

update clarify, going forward not plan work (commit/checkout) oldmigration , oldroot anymore. want history reflect situation how purposes of reading history log , see changed files , why.

in situation, can feed git-svn multiple directories represent trunk, branches , tags cover possibilities throughout history.

i recommend doing in 2 steps, git svn init , git svn fetch, rather single git svn clone give bit more control.

in case be...

git svn init --trunk=trunk/ --trunk=. --branches=branches/ --tags=tags/ ...

you may wish try --trunk=branches/migration, leave own historical branch (presumably later merged new trunk) trying git pretend trunk along.


Comments

Post a Comment

Popular posts from this blog

node.js - Mongoose: Cast to ObjectId failed for value on newly created object after setting the value -

-
this question has answer here: what's mongoose error cast objectid failed value xxx @ path “_id”? 7 answers even though has been asked many times because entity has no valid objectid field. i came across situation objectid set value can casted objectid still error. the schema: var serviceschema = parammongoose.schema({ servicename:{ type: parammongoose.schema.types.objectid , ref: 'servicenames',required:true } }); pseudo code: servicefromdb=new service({servicename:'some name'}); servicefromdb.servicename='000000000000000000000001'; servicefromdb.save(function(paramerror,paramdata){ if(paramerror){ console.log('but but...',servicefromdb,paramerror) } }); the output of code is: but but... { servicename: 000000000000000000000001, _id: 55079a90286f49280364f78b } { [casterror: cast objectid faile...
Read more

[C++][SFML 2.2] Strange Performance Issues - Moving Mouse Lowers CPU Usage -

-
i've been working on making 2d map editor past 2 weeks or so, , i've run strange problem. trying optimize code, example, making functions should've been functions begin with, did made cpu usage go through roof. i've tried commenting out different sections of code thought culprits (scrolling, rendering, other calculations) no avail. think issue might trying call things within different functions, sake of making modular possible, i'd functionality. the other major change i've made since file i'm comparing i've ported variables external cpp file, since having variables global makes lot easier use within different functions. simple issue, can't life of me understand why happens. with original code, around 2-3% cpu usage. new code, around 20-35%, but, if move mouse around, it'll drop around 6-8%. tl;dr: after trying optimize code using functions, i've somehow killed performance, , found strange quirk moving mouse reduces cpu usage.. /...
Read more

ios - Possible to get UIButton sizeThatFits to work? -

-
i have been using method of resizing uibuttons depreciated, , not robust. , other reasons, want sizethatfits work uibuttons. i've read online, i'm not sure if should work (seems working some, not others, difference maybe between style, i'm using custom). here simple test code recreate issue (i put in viewdidload test, shouldn't matter, , real code part of large project): uibutton *btn = [uibutton buttonwithtype:uibuttontypecustom]; [btn settitle:@"this test long title need word wrap more single line when displayed on tiny ipod in portrait view." forstate:uicontrolstatenormal]; btn.titlelabel.linebreakmode = uilinebreakmodewordwrap; // depreciated - nothing replace it? cgrect r = btn.frame; r.origin.x = 0; r.origin.y = 0; r.size.width = 320; r.size.height = [btn.titlelabel.text sizewithfont:btn.titlelabel.font constrainedtosize:cgsizemake(r.size.width,100000) linebreakmode:btn.titlelabel.linebreakmode].height; // returns approx 86 , changes correctly ...
Read more