I just did a merge using something like: svn merge -r 67212:67213 https://my.svn.repository/trunk . I only had 2 files, one of which is a simple ChangeLog. Rather than just merging my ChangeLog changes, it actually pulled mine plus some previous ones that were not in the destination ChangeLog. I noticed there was a conflict when I ex...
I'm in the process of refactoring some code which includes moving folders around, and I would like to regularly merge to keep things current. What is the best way to merge after I've moved folders around in my working copy? ...
Is there a way to tell subversion "update/merge unless it would cause a conflict"? I know you can use --dry-run / status -u to check before running the update, but I often have others running updates and getting broken webpages because they don't notice the "C index.php" line. I've also noticed that svn doesn't seem too unhappy about...
When merging two code branches in Team Foundation Server I get the following error: "the given key was not present in the dictionary" Some files are checked out and show up in "Pending Changes", but no changes are actually made. I have a workaround: Attempt to merge (fails with error) Get latest from trunk Undo all pending ch...
I want to combine two structures with differing fields names. For example, starting with: A.field1 = 1; A.field2 = 'a'; B.field3 = 2; B.field4 = 'b'; I would like to have: C.field1 = 1; C.field2 = 'a'; C.field3 = 2; C.field4 = 'b'; Is there a more efficient way than using "fieldnames" and a for loop? EDIT: Let's assume that in t...
We're replicating a database between London and Hong Kong using SQL Server 2005 Merge replication. The replication is set to synchronise every one minute and it works just fine. There is however the option to set the synchronisation to be "Continuous". Is there any real difference between replication every one minute and continuously? ...
I am doing a Web Deployment of my website and I have the merge assemblies property set to true. For some reason I get the following error. aspnet_merge : error occurred: An error occurred when merging assemblies: The relative virtual path 'obal.asax' is not allowed here. It seems to have something to do with the Global.asax, but I'm ...
In TFS when you merge branch A to branch B and checkin, you get a single changeset on B (typically with a comment like "merged A->B"). This means B doesn't have any of the checkin history from A. So if someone created a new file on branch A, you can't tell who created it from branch B. And if someone updated a file on A, you can't t...
Is it possible to merge to a branch that is not a direct parent or child in TFS? I suspect that the answer is no as this is what I've experienced while using it. However, it seems that at certain times it would be really useful when there are different features being worked on that may have different approval cycles (ie. feature one mi...
Are there any utilities out there which can draw pictures of the merge history of a subversion repo - we always commit merges with a (fairly) consistent log message, and it would be handy to be able to automatically extract this info into a single picture that shows what branches occurred when, and what the state of merges is. I'm just ...
In order to merge independant HTML changes, I'm looking for recomendations for a 3-way comparison / merge library for HTML. The common 3-way text merge algorithms perform poorly because they do not understand the tree like structure of HTML and XML. Of course, such a library must understand the looser syntax of HTML, i.e. tags are not ...
I have a Windows C# program that uses a C++ dll for data i/o. My goal is to deploy the application as a single EXE. What are the steps to create such an executable? ...
Hi, I wonder if someone knows of a tool or script which easily merges a bunch of jar-files into one .jar. A bonus would be to easily set the main-file manifest and make it executable. The concrete case is a java restructured text tool: http://jrst.labs.libre-entreprise.org/en/user/functionality.html I would like to run it with someth...
Hi all, It seems like such a simple thing, but I can't find any obvious solutions... I want to be able to take two or three feeds, and then merge then in to a single rss feed, to be published internally on our network. Is there a simple tool out there that will do this? Free or commercial.. update: Should have mentioned, looking for ...
We have concurrent edits happening on Word documents and I want to make sure that Subversion can handle merging .doc files. Do you know if Subversion handles merges of Word documents well? ...
I'm pretty used to how to do CVS merges in Eclipse, and I'm otherwise happy with the way that both Subclipse and Subversive work with the SVN repository, but I'm not quite sure how to do merges properly. When I do a merge, it seems to want to stick the merged files in a seperate directory in my project rather than overwriting the old f...
I've not been able to find any information on this, but is a keycode required to be embedded in the CR2008 merge modules for a .NET distribution? They used to require this (which had to be done using ORCA), but I've not found any information on this for CR2008. ...
When a branch is reintegrated to the trunk, is that branch effectively dead? Can you make modifications to the branch after the reintegration and merge those back into the trunk at a later date? ...
What is the best way to resolve a conflict when doing a "git svn rebase", and the git branch you are on becomes "(no-branch)"? ...
I'm wondering if the need to alter the indentation of code to adjust the nesting has any adverse effects on merging changes in a system like SVN. This is a really open ended question. I'm sort of fishing for information/anecdotes here. Edit: Thanks all! I'd accept an answer but which one? I up moded them all. ...