Accepting the possibility of extreme ridicule, I must admit that I really miss sun Teamware's filemerge tool. I have switched from solaris to red hat linux, and find myself regularly missing filemerge (not to be confused with the Apple tool of the same name), as well as the solaris version of pstack (which worked on core files just as we...
We have two branches: 1. HEAD - the latest version (AKA Trunc) 2. PROD - the released version When you fix bugs in the released version, which of these do you do: Fix it in PROD, then merge to HEAD Fix it in HEAD, then merge to PROD The advantage of (1) is that this way you absolutely cannot harm the released version by accidentally...
The scenario is: svn cp or mv some file modify that file svn diff > mypatch On other machine (same working copy, but no changes): Try to apply mypatch. Fail -> tries to modify unexistant file. How can I make svn diff produce patch-appliable patch, or cleanly apply patch produced by svn diff in this case? I can't commit. I would l...
I have been using TortoiseSVN, svn, and subclipse and I think I understand the basics, but there's one thing that's been bugging me for a while: Merging introduces unwanted code. Here's the steps. trunk/test.txt@r2. A test file was created with 'A' and a return: A [EOF] branches/TRY-XX-Foo/test.txt@r3. Branched out the trunk to TRY-X...
Here's my problem.I have 2 xmlfiles with identical structure, with the second xml containing only few node compared to first. File1 <root> <alpha>111</alpha> <beta>22</beta> <gamma></gamma> <delta></delta> </root> File2 <root> <beta>XX</beta> <delta>XX</delta> </root> This's what the result should loo...
I have a dev branch that hasn't been touched for a while. I merged the trunk into it to integrate many fixes/changes in the main line since it was branched out, but now I have many small conflicts (merge-left/merge-right). I want the latest trunk revision to be used to resolve each conflict. Is there a command I can run that will resolv...
What's a nice way to merge two sorted arrays in ActionScript (specifically ActionScript 3.0)? The resulting array should be sorted and without duplicates. ...
I have an Excel table with several items 1, 2, 3..., each of which has subitems 1.1, 1.2, etc. I'm using the list of subitems as my key column and populating the main items using vlookups, but only showing each main item once. /| A | B | C | -+---------+----------+----------+ 1| Item1 | 1.Note | Item1.1 | 2| ...
Hello! I have one big problem with merging - it falls on start with strange message: "Server sent unexpected return value (401 Authorization Required) in responce to PROPFIND request for '/svn/autogroup_projects/.../Data.sln'". Really that folder is not exists in the branch, but we had it in trunc (it modificated separately). And that...
Hi, I have 2 wav files that I want to make/combine/merge into one file with the two sound tracks. Is there any api for that task or some built inn commands in .NET that can I can use in som genius way to make this task possible? Many thanks for the help. :) ...
We have a project where a vendor produces some custom code for us and we produce the backend content. Every time they ship us a new version, we manually merge that whole folder structure into our repository. This is easy for added and modified files (just copy/paste), but I have to create a batch script to delete all the files/folders th...
What is the best way to combine both hashes into %hash1? I always know that %hash2 and %hash1 always have unique keys. I would also prefer a single line of code if possible. $hash1{'1'} = 'red'; $hash1{'2'} = 'blue'; $hash2{'3'} = 'green'; $hash2{'4'} = 'yellow'; ...
I have two unix partitions under debian which I would like to merge (disk space problems :/). What would be the easiest way to do it? I think it would be best to tar or copy files from one partition to the other, delete one and resize the other. I will use parted to resize but how should I copy the files? There are links, permissions and...
I have two properties files that are not the same and I need to find the differences. The second file is sorted by key. Is there a tool that can help me with it? From what I've seen every merge tool cares very much about the order. ...
From the man page on git-merge, there are a number of merge strategies you can use. resolve - This can only resolve two heads (i.e. the current branch and another branch you pulled from) using 3-way merge algorithm. It tries to carefully detect criss-cross merge ambiguities and is considered generally safe and fast. recursive - Thi...
Hi all, Merging project/solution files is a well-known disaster among developers/SCM admins performing merges in their source control. Take, for example, a common scenario: development is done on a project/solution in two different branches. When time comes to merge back into a main development line, there is a very small resemblence ...
Microsoft Visual Studio (2005 and 2008) seems to have fun shuffling the Project IDs (GUIDs) around each time we do a little change in a solution. We found that this little detail leads to frustration each time someone has to merge branches in Source control... We though about coding a little tool to sort those Project ids before Check I...
I have an svn repository where I have trunk and a branch. I intend to merge the trunk into the branch at regular intervals, however, when I do this I see many property status changes, in additional to actual file content changes. On further investigation the property changes are mergeinfo properties. I wouldn't expect this because we ...
I have a set of work items that are completed and I am ready to move their changes to our production branch. Is it possible to find the changesets that are attached to them and selectively merge them with the target branch? ...
I'm using Subversion 1.4.6. I cannot upgrade to version 1.5 right now. The situation: The trunk has a lot of structural changes (i.e. moving files around, mostly). I have a branch that was recently merged from the trunk, but before the major changes. What is the best way to merge the trunk to the branch? What I had in mind: First...