What algorithms or Java libraries are available to do N-way, recursive diff/merge of directories? I need to be able to generate a list of folder trees that have many identical files, and have subdirectories with many similar files. I want to be able to use 2-way merge operations to quickly remove as much redundancy as possible. Goals...
I had built a custom XML merge with Microsoft Word 2007 using the docx format, allowing the user to access fields expressed in a schema and include them in a Word DocX. I then opened the file, did the search/replace throughout the document, closed it up and opened it, fully merged, in Word. With the patent suit loss, new users of our so...
Note: I am not sure whether this has been already asked, as I can't find any question fitting to my context(or I am unable to understand the existing questions' contexts') I am loving Git these days. Especially, the topic branches. I am working on a small code sharing application. And I have got (local)branches like "master", "authentic...
Currently when I right-click -> Merge on a specific file in Visual Studio 2008 it attempts (and often succeeds) to automatically merge the file to my indicated target. How can I force VS to always allow me to manually compare and merge the file in my merge tool? I should mention that my source control is TFS. ...
Hi, i am looking for a 3rd party utility pack sort of library for .Net to handle excel merging with formating, formulas, charts and etc. which does its job well and if possible fast. ...
Branching sources for release cycle is one of common source management scenarios. Merging as soon as possible is a good practice. Thus we have a human factor: branch is closed, but someone forgot to merge something back to trunk. Q: Is there a "one click" way to get all revision numbers that were not merged from branch X to trunk? (Not...
Hi, I want to merge two PDF-files retaining the index (the xref-table) of both files. I wanted to write my thesis in LaTeX, except for the covering page which is rather fancy and complex. Now I want to merge the covering page of my thesis with the contents, but I could not accomplish this job with retaining the index using the followi...
Hi, I've got a named branch (same repository) that was created in order to to spike something. I've now decided that I want to move all the changesets created in the branch back into the main (default) and then close the branch. I've tried a number of different things, including what was outlined in this post (http://stackoverflow.co...
Hi, I am using TortoiseSVN for my C++ project, and am trying to "reintegrate a branch" back into the trunk. My case is simple enough so that for every file which has changed in the branch, I would like it to completely overwrite the matchinf file in the trunk. Unfortunately, TortoiseSVN is smarter than me, so it merges each pair of fil...
I want to be able to do a 3-way merge of XHTML documents: Start with some original copy of the document One user edits a copy of the original document Another user edits a separate copy of the original document Need a tool to merge (automatically and/or visually) the changes made by the two users. Note: I want to include this funct...
Title really says it all. There is the -O option for opening splits vertically, and -o for horizontally, but trying to mix them doesn't seem to work. My goal is to use g/vimdiff for 3-way file merging in mercurial in a way more like kdiff3 does. This method would have the 3 files to be merged split into 3 vertical tabs across the top ...
I've been digging through the documentation for the data.table package (a replacement for data.frame that's much more efficient for certain operations), including Josh Reich's presentation on SQL and data.table at the NYC R Meetup (pdf), but can't figure this totally trivial operation out. > x <- DT(a=1:3, b=2:4, key='a') > x a b [...
What is the optimum way to merge 2 PDF files with ITextSharp in C#? I'm using ASP.NET/.NET3.5. ...
How can I get a list of all the model objects that have a ForeignKey pointing to an object? (Something like the delete confirmation page in the Django admin before DELETE CASCADE). I'm trying to come up with a generic way of merging duplicate objects in the database. Basically I want all of the objects that have ForeignKeys points to ...
I am having problems with our merge tool as sometimes it fails to match the unchanged blocks in the two branches correctly. When this occurs the merge tool becomes useless, and the merge has to be done by hand. Therefore I am looking for a tool that: Understand what VB.NET function/method definitions looks like and gives them a h...
When a simple refactoring like “rename field” has been done on one branch it can be very hard to merge the changes into the other branches. (Extract method is much harder as the merge tools don’t seem to match the unchanged blocks well) Now in my dreams, I am thinking of a tool that can record (or work out) what well defined refactorin...
There is an internal SVN repository on which many changes have been made. This contains not only the project of interest, but also many other folders. There is an external git repository, on which many changes have now been applied. What is the best way to merge these 2 sets of changes. I was thinking, take the diff of the git HEAD an...
Hey, I often hit this problem: I have to merge a svn branch into trunk. The branch is old, and has seen a lot of changes that were manually copied from one branch to the other. svn:merge info is not present. Araxis almost makes my life easy. I make a checkout of trunk, a checkout of my branch, and a checkout of my branch at the revisi...
I've finished working on a feature branch feature-x. I want to merge results back to the default branch and close featrure-xh in order to get rid of it in the output of hg branches. I came up with the following scenario, but it has some issues: $ hg up default $ hg merge feature-x $ hg ci -m merge $ hg up feature-x $ hg ci -m 'Closed b...
Does anyone know if it's possible to merge two lists (or any collection) in constant time in Java ? http://www.cppreference.com/wiki/stl/list/splice It's so easy to do that using linked lists in C... Thanks, ...