version control - Merge multiple SVN repositories with a twist -

-

i'm trying merge multiple source repositories together, maintaining version history during process. i've been doing lot of reading on svnadmin dump/load process, there's 1 piece i'm still missing.

each source repository setup standard "trunk" , "branches" setup. that's good. problem want massage paths when merge things together. instance...

many of approaches i've seen allow create structure this:

/project1 /project1/trunk /project1/trunk/html /project1/branches /project2 /project2/trunk /project2/trunk/html /project2/branches

however, want our final structure instead:

/trunk /trunk/project1 /trunk/project1/html /trunk/project2 /trunk/project2/html /branches

reason being: of projects intertwined. project1 might our backend software, project2 our front-end software, project3 our cron jobs, etc. basically, it's 1 combined system, , project specific branching seems make our life more difficult.

that said, problem arises how translate old directory structure new. thoughts?

it may meet needs merge repositories is, separate branching, move things around in new, merged repo latest revision has files want them. less work trying edit history , still preserve history, although may need turn on showing history after copy. preferred structure new revisions, if checking out old revisions puts things in wrong place.


Comments

Post a Comment

Popular posts from this blog

c# - How to set Z index when using WPF DrawingContext? -

-
how set z-index drawing object when using drawingcontext.drawxxx() methods? the object drawn last have higher z index. can't change index of drawn objects. way draw in order. if using wpf (as placed tag), can use, example, canvas control. create shapes need like polyline obj = new polyline(); //... // ... set properties of obj and add them canvas uielementcollection: yourcanvasname.children.add(obj); //or yourcanvasname.children.insert(i, obj); first items of collection have higher z index. advantages in way: no need redraw on window changes, can anytime move objects , change order.
Read more

razor - Is this a bug in WebMatrix PageData? -

-
i think may have found bug in webmatrix's pagedata, not sure. concerns how pass data partial page calling page. in webmatrix documentation (tutorials, e.g. " 3 - creating consistent look ", , example code), pagedata recommended mechanism pass data between pages (e.g. content page layout page, or partial page). however have found not work other way, pass data partial page calling page. modifying or adding entries in pagedata in partial page, not seem calling page. cutting right down simplest possible example, in test page may have this: @{ pagedata["test"] = "initial entry"; } <p>before calling partial page, test value @pagedata["test"]</p> @renderpage("_testpartial.cshtml") <p>after returning calling page, test value @pagedata["test"]</p> and in _testpartial.cshtml page might have this: @{ pagedata["test"] = "modified entry"; } <p>in partial page...
Read more

visual c++ - Using relative values in array sorting ( asm ) -

-
i need sort through array , sort each individual row in array in ascending order. doesn't seem going (surprise!) keep getting hit 2 errors: a2101: cannot add 2 relocatable labels , a2026: constant expected here's sort, makes sense me, think i'm still trying implement high-lvl language techniqes assembly. there way around not being able use relative values? (the array 7 rows 9 columns, btw). mov cx, 7; cx = number of rows outer: ; outer loop walk through rows push cx mov cx, 9 mov row, cx ;rows middle: ; middle-loop walk through columns push cx sub cx, 1 ;cx = cx-1 mov column, cx ;columns inner: ;inner loop - compare , exchange column values cmp marray[row*9 + column], marray[row*9 + column+1] xchg marray[row*9 + column+1], marray[row*9 + column] ; compare , exchange values marray table inc column loop inner pop cx loop mid...
Read more