I have a .net application with about 10 assemblies. It would be nice to have them all together as a single assembly. Is this possible? How do I do it? I guess something like a jar file for java applications. Thanks ...
I'm using Mercurial in a recent project. On the web server where I'm deploying the project I have a slightly different config file with production settings. The problem is when I pull and update, I often have to merge and commit as well. Is this the correct workflow? It seems strange that in order to be able to continue to update I h...
Brought forward from http://stackoverflow.com/questions/1525027/subversion-feature-branch-requires-changes-from-another-feature-branch I have two feature branches: "FeatureA" and "FeatureB". FeatureA is complete, but not merged to trunk because it's not been confirmed whether it should go in the next release or not. FeatureB is in...
is there a good way in Team Explorer (or other) to take a folder and get a list of all the branch points in it? I have some legacy source that was cut up and branched into a nicer folder structure. This legacy source has been supported while the new project was stabilized and now i need to take those bug fixes up to the new structure but...
If I create a branch in SVN off trunk rev 10 then realized that what I want was rev 9 should i just ditch this branch and create a new one off of rev 9 or is there a way to "rebase" it off of rev 9? The problem is that in my code I had to rollback some changes and then create a branch for what I now realize is a long/big change. Since ...
We have two different projects on our source safe database (one of them is a copy of another one for some reasons there was a problem with our branching operation that didn't pin our branched files therefore I had to get a label and add it as a different project) I know how I can see the differences between two projects and I know that t...
Hello We are using the XML or Word ML format from Office 2003. How do I get a macro to run after a MS Word ML document has been merged by another application (not Word) called SIMS by Capita. How can I get the Macro to run after a merge, when the document is being previewed? ...
I have several config files in my .net applications which I would like to merge application settings elements etc. I was about to begin doing it manually as I usually do, however thought there must be an XML diff GUI tool available somewhere. The tool would be able to go to the element level to compare and display the differences etc....
My Java application's save files are in XML, and in certain cases, a user might want to merge two save files together. What packages have people used to do this? Any caveats to offer? ...
Our team has noticed that CVS brings back deleted code if you have changes in your working file within the block of code that has been deleted. CVS does this silently without presenting the merge conflict markings. Does anyone have a work around for this? Is there a clever way to detect that this is about to happen? ...
I'm fairly new to git. Just a few minutes ago, I performed a merge on two branches; let's call them A and B. I was 'on' branch A; my next command was 'git merge B'. It said there was one conflict, but I looked in the file and there were no conflict markers. I added the file, committed the change, and did the merge command again. "Already...
I just did an svn merge to merge changes from the trunk to a branch: $ svn merge -r328:HEAD file:///home/user/svn/repos/proj/trunk . --- Merging r388 through r500 into '.': A foo A bar C baz1 C baz2 U duh [...] But there were too many conflicts, so I'd like to undo that. One way to do that is to commit and then merge ...
I'm trying to understand lists in prolog when I stumbpled over this problem: there's a predicate mergeandmap/2 that should basically do this: mergeandmap([[a1,...,an],...,[z1,...,zm]],[x1...xn]) %----------list 1------------ -list 2-- List 2 consits of letters (for example [a,b,c]). List 1 consits of several lists with s...
want to get file_3 by merging file_1 and file_2 if manual merge needed, text editor or merge tools can be used. preferably file_3 is in git merge like format. file_1 is in git, but both with or without git to do the merge is fine on Linux. ...
I have a number of remote repositories that I want to merge together. Some of the subtrees in those repositories are unique to the remote (they contain data that is host-specific), other subtrees contain data that is (supposed to be) common across all remotes. What I want to do, essentially, is run "git pull " for each remote. This wi...
I have a method that gets a SortedMap as input, this map holds many SortedMap objects, the output of this method should be one SortedMap containing all elements of the maps held in the input map. the method looks like this: private SortedMap mergeSamples(SortedMap map){ SortedMap mergedMap = new TreeMap(); Iterator sampleIt = map.va...
I'm trying to get in the habit of doing code reviews, but merges have been making the process difficult because I don't know how to ask Mercurial to "show only changes introduced by the merge which were not present in either of its parents." Or, slightly more formally (thanks to Steve Losh): Show me every hunk in the merge that wasn...
Revision 107 accidentally merged away all the changes from 100-106 Revision 108 was a hg revert --all -r 106, followed by hg commit, which was probably the wrong thing to do, since instead of merging the branch where I made all the changes, I've encompassed all the changes into one changeset with no description or history. A) How sho...
I have a macro to select a range of cells on the same row and then merge & left justify that selection. I would like to enhance it to allow me to select a range or block of rows and perform the same action on each row in the range. Does anyone have some sample code to do something like that? Thanks! Craig ...
Hi, I'm working on a XSLT transformation that consists on merging two XML and then transform the result using another template. The idea is that depending on a field of the original XML file, the secong XML changes. For example: <?xml version="1.0" encoding="UTF-8"?> <data> <information> <stmtinfo> <type>80</type> <language>...