I want to propose a lazier version of merge: merge [] ys = ys merge (x:xs) ys = x:merge ys xs For one example use case you can check a recent SO question about lazy generation of combinations. The version in the accepted answer is unnecessarily strict in the second argument and that’s what is … Read more
Updated answer: My original version of the script below was flawed in the sense that $conflicting_files in fact did not contain only the files that really had conflicts, but all files that were changed in both parent branches (but not necessarily had conflicts). Also, it was not using “the configured merge tool” as advertized in … Read more
A few ways to make it more efficient, Pythonic: Eliminate the set() construction, since the algorithm should prune out duplicates during in the main loop. If you just need to iterate over the results, use yield to generate the values. Reduce construction of intermediate objects, for example: move the tuple() call to the point where … Read more
You can just pull the changesets into one big repository. Start with the A repo: $ hg init combined $ cd combined $ hg pull ../A $ hg update Then forcibly pull in B and dummy-merge the two heads so that you keep the files from B: $ hg pull ../B –force $ hg merge … Read more
You no longer have to mess with the .ini file. As long as you have both TortoiseHG and WinMerge installed you will see it as an option in TortoiseHG Global Settings – TortoiseHG section – Three-way Merge Tool and Visual Diff Tool. It shows up as “winmergeu”. Banged my head against the wall for a … Read more
Local is r133 Other is r134 Base is r128 (the common ancestor to both r133 and r 134) When you perform a 3 way merge it compares all three of those together to help you decide what to take and from where. By seeing what change is in the other revision and what the common … Read more
Perhaps the simplest option result = {x[‘id’]:x for x in lst1 + lst2}.values() This keeps only unique ids in the list, not preserving the order though. If the lists are really big, a more realistic solution would be to sort them by id and merge iteratively.
Even though this is an old question, the current state of affairs with git-svn has changed since it was asked. Specifically, in git 1.7.5, there is some limited support for setting the svn:mergeinfo when dcommitting back to svn. git svn dcommit now accepts the -mergeinfo=<mergeinfo> flag. To quote from the 1.7.5+ man page: -mergeinfo=<mergeinfo> Add … Read more
We struggled with this issue for few weeks and we finally got it solved. In our case, we worked on a branch that was merged with all trunk revisions on a daily basis. When we tried to reintegrate it (merge back to trunk) we got this error. When we tried to merge the missing ranges … Read more
When I’m working with csv files, I often use the pandas library. It makes things like this very easy. For example: import pandas as pd a = pd.read_csv(“filea.csv”) b = pd.read_csv(“fileb.csv”) b = b.dropna(axis=1) merged = a.merge(b, on=’title’) merged.to_csv(“output.csv”, index=False) Some explanation follows. First, we read in the csv files: >>> a = pd.read_csv(“filea.csv”) >>> … Read more