I m working on a project which contain about 17 projects in it, means 17 DLL's. i want to merge some assemblies together. after googling i found ILMerge . is Ilmerge good ? n how to use it? can anyone tell me ? i tried it but so many errors came when i try to run the .exe. Anyone ? ...
I have some files in branch b1 that have gone trough several revisions. E.g., r1, r2 and r3. I want to merge those files into HEAD but only changes made in revisions r1 and r3, not the ones in r2. With eclipse I can merge only the changes that I want manually and then I can save the file and commit the changes to HEAD. How can I later me...
there is a time slot table. it exists on two or more computers. the table maintains the reservation of the time slot for the complete year. assume that the connection between the servers breaks. user on site1, enters data like :-- timeslot(3:8) reserved for(this) where timeslot is the primary key user on site2 does the same. pro...
I have an SVN (1.6.12) project containing a trunk and one branch. I am trying to learn how merging works. project + trunk (14) + branches + test-branch (14) The numbers in parentheses are the revision numbers. I execute a merge from the trunk to the test branch using the the commands "cd branches/test-branch; svn merge svn+ssh://......
I am trying to keep a feature branch up to date by merging trunk into the branch. Problem is, that about 2000 files that was there when the branch was created, and that has been left untouched on both the branch and on trunk is getting updated with nothing but svn:mergeinfo. The project is rather large in scale, and the impact on our SV...
I'm planning to make a white-label product that will be delivered to clients. The product is developed using an MVC framework (CakePHP in particular), and the idea is to let the customer modify not only basic stuff like the CSS, but also the templates. Now, templates, although they are "views", they still have some logic to them. Lot...
I just switched over from SVN where after a few changes to the trunk I would merge a range of revisions (from my last merge from the trunk to the branhc - HEAD) into a branch. I want to do the same with Mercurial using TortoiseHG but I can't figure out how. I just committed two changesets to the trunk, now I need the branch to integrate ...
I came across the solution I need in PHP but I need one that I can use that's just as simple in an ASP.NET environment. I am combining 4 transparent png images to create a single image (Lets say its a custom certificate) with one of 4 background images, one of 4 header logos, one of 18 category titles and another variable image that sta...
I hope my code can explain itself, I am almost there, I just am stuck on the way how to merge optional data into a JSON object with multiple levels (is that even what it is?) //get video list - example: video1.flv;test23.flv;Grabledable.flv var files = j('.videos').html().split(';'); // assume first we have one video, so no need of play...
Hi, I'm looking for some help on the javascript angle of this problem. I have a table that goes like... <table> <tbody> <tr> (Row 1) <td colspan="3"> <p>This Says Something</p> </td> </tr> <tr> (Row 1a) <td> <select option> </td> </tr> <tr> (Row 2) <td colspan="3"> <p>This Says Something</p> </...
I can't get my head around KDiff3 or Beyond Compare in the merge mode. Is there any tutorial to this feature? ...
I've got a project which has a master branch and a stable branch - the branches diverged long time ago. Now I've got a couple commits on the stable branch, which I also want to have on the master branch (a bug fix). I cannot merge, as the branches diverged and there's loads of unmerged changes - I just want the 4 commits. So I tried che...
I have a repository that looks like this: /a/trunk/Library /a/branches/FeatureX/Library /b/trunk/Application /b/branches/FeatureX/Application I want to rearrange this so that I have the Application and Library folders next to each other: /a/trunk/Library /a/trunk/Application /a/branches/FeatureX/Library /a/branches/FeatureX/Applicati...
So say I have one xml file such as this: <shapes> <shape>shape1</shape> </shapes> And another xml file like this: <parentNode> <shapes> <shape>shape 2</shape> </shapes> </parentnode> I would like the output to be: <parentNode> <shapes> <shape>shape1</shape> <shape>shape 2</shape> </shape...
I've got wads of autogenerated HTML doing stupid things like this: <p>Hey it's <em>italic</em><em>italic</em>!</p> And I'd like to mash that down to: <p>Hey it's <em>italicitalic</em>!</p> My first attempt was along these lines... <xsl:template match="em/preceding::em"> <xsl:value-of select="$OPEN_EM"/> <xsl:apply-templa...