version control - "Best" svn to hg conversion tool for my specific purposes -

-

when comes converting svn hg seems there million pages devoted (both in stackoverflow , web in general), seem have laundry lists tools available, , maybe recommendation (though vary, , don't why it's recommended) no real information factors make tool best requirements. bad of info comes 2010 or so, notes or other pages saying "that tool outdated and/or not maintained". hg being rapidly developed 2010 might stone age.

i want convert svn hg largely purposes of simplifying serious merges. i'd love convert whole team hg, various reasons isn't going happen yet. it'll i'll use hg sometime, while rest of team continues svn. therefore it's important me able round trip, i.e. convert svn repo hg, work on hg, push changes svn. it's important able sync hg repository svn repo since ongoing changes made svn repo. while local hg repo serve of purposes, i'd keep central 1 on server can convince other people try it.

i understand main reason dvcs's hg , git better @ merging not they're distributed, keep history in form that's more conducive merging. if convert svn repo hg hg enough of history in preferred form it'll able better merges? when sync?

i don't care os conversion tool runs on, use windows 7 our laptops , linux on server (which have superuser access to). if might prefer linux that's svn repo , central hg repo be. nor care how long initial conversion takes (though sync matter) can start conversion on friday , in on monday (our svn repo not big anyway).

can give me advice svn hg tools serve specific requirements?

pure mercurial (tortoisehg on win-box) + hgsubversion

  • just clone svn-repo local mercurial repo
  • work, commit hg
  • hg pull equivalent svn up
  • hg push publish changes svn-repo

some notes (dumb quote hg svn partially):

  • when converting subversion, hgsubversion not recognize merge- info, , not create merges based on it.
  • mercurial merges cannot pushed subversion. have rebase work on top of svn head
  • multi-heads branches can't pushed (svn-history linear, contrary hg's dag)
  • it not possible interact more 1 subversion repository per mercurial clone.

some notes , observations, not fit in comments well

  • svn not hide mergeinfo mercurial, it's current mainline-hgsubversion, ignore data. incorrect common parent (in case of hg-merges after svn-merges) not prevent neat definition of changed chunks (at least, memory, "cyclic cross-branches merges" - a->b->c->d->a - isn't problem in hg, contrary svn)
  • on real svn projects branch per task workflow used svn-wc , hg-workdir in parallel (cloned svn-repo local mercurial, transfer /mostly after merges/ sources wc commits repo). prefer separations of hg , svn in different places, but, theoretically, can common (wd+wc) dir, mutual ignoring of foreign metadata

Comments

Post a Comment

Popular posts from this blog

dns - How To Use Custom Nameserver On Free Cloudflare? -

-
i have problem. i own small hosting company. trying add cloudflare site free cdn. problem when sign have change nameservers nameservers. have nameserver dns set through godaddy, how add them cloudflare? main site uses company's nameservers whenever add them site goes offline. when go cloudflare's dns records click on dropdown, click ns, , there's 2 boxes 'name' , 'nameserver'. mean input 'ns1' 'name' , 'ns1.domain.com' 'nameserver'? input server's ip addresses? is there way of accomplishing free version of cloudflare? that impossible. option have custom name servers available on business , enterprise. see https://www.cloudflare.com/plans . also, might mistaken. must change name servers in domain register settings, not on cloudflare.
Read more

python - Pygame screen.blit not working -

-
in program creating in python/pygame, screen.blit not working. in other programs have made, screen.blit works. error: traceback (most recent call last): file "c:...\main.py", line 46, in <module> screen.blit(sight.image, sight.rect) attributeerror: 'int' object has no attribute 'blit' the error in question caused screen variable being allocated integer instead of pygame.surface() object.perhaps accidentally rewrote variable somewhere? from can make of doing, seems stating position of blit full rect instead of coordinate. when do: screen.blit(sight.image,sight.rect) what program seeing is: screen.blit(sight.image,(sight.rect.x,sight.rect.y,sight.rect.width,sight.rect.height)) i assuming don't intend this. remember rect object consists of position, width , height. to correct code, put (sight.rect.x,sight.rect.y) location goes instead this: screen.blit(sight.image,(sight.rect.x,sight.rect.y)) the .x , .y corres
Read more

c# - Web API response xml language -

-
i having simple post url clients send post request. http://mydomain.com/requests/request post data: <request> <orderid>1e008921</orderid> <ordername>mc1</ordername> </request> to respond sending them xml <srequest> <requestedby>client 1 </requestedby> <requestname>test name</requestname> <requeststatus>success</requeststatus> <srequest> now client wants above xml in different language (say french ) how handle ? how send response language preference in web api ? specially post scenario ? (append language string ? or best practices ?) i suggest either include in url: http://mydomain.com/fr/requests/request or use http header accept-language . read more in answer to: good way changing language resources dynamically request
Read more