I've been encountering a little quirk with TFS lately. A good chunk of time when I merge from one branch to another TFS does something funky with project references. If I let TFS handle the merging whenever possible, it will insert both a reference to the source branch and the target branch. Depending on whose machine you try it from,...
I have an XML document based what Excel produces when saving as "XML Spreadsheet 2003 (*.xml)". The spreadsheet itself contains a header section with a hierarchy of labels: | A B C D E F G H I -+----------------------------------------------------- 1| a1 a2 2| a11 ...
Hi, I've made an ASP.NET 2.0 website and it uses two databases namely aspnetdb and my_db.I ran the aspnet_regsql.exe -E -S localhost -A mr tool and I got the aspnetdb.mdf in my project.I used it for providing login features to my site. Now i want to publish the site to a remote hosting server which I've purchased. They have provided me ...
When I merge stuff in my repository Subversion wants to add/change a lot of svn:mergeinfo properties to files that are totally unrelated to the things that I want to merge. Questions about this behaviour have been asked before here on Stackoverflow.com, as you can read here and here. From what I understand from the topics mentioned abov...
I can't seem to find an easy way of doing this. We have a trunk, which has a particular set of Changesets checked into a Work Item in TFS. I want to exclusively merge the changesets in this Work Item into another branch. Surely this can't be difficult? ...
This question is a derivative of a previous question posted :here I have a project that contains code that is consumed by many other projects. Specifically, one folder in this parent project has been branched to dependent child projects. We have since made changes in the parent project and checked them in. In Source Control Explorer,...
The options for source code diff viewing/editing/merging seem to be: Free: Tortoise Merge Meld * WinDiff WinMerge * DiffMerge * KDiff AJC Diff Diffuse Commercial: Total Commander's Diff viewer * Beyond Compare * Delta Walker * Araxis Merge * Are there any other options? (Wikipedia suggests a few) What's your favorite tools fo...
I've recently been working through a large codebase, refactoring and generally improving design to increase coverage. Also, in quite a few files I've removed excess using statements, moved methods so that similar functionality is close together, added regions etc. but not actually changed the functionality of the code in the file. Meanw...
Are there any interactive merge tools that, when they get a merge conflict on a given line, go back and try to do a char-at-a-time merge of the conflicting lines? I'm thinking of cases where you get a merge conflict between a changed line of code and the same line getting indented. BTW: I'm using Beyond Compare called from TortoiseSV...
In my current project I have to decide which technique to use when branching. I have two options (we'll assume that we already have decided to develop in the trunk): Version branches Make a branch whenever a new version is put on the test machines and tag it like "release0.1". Bugs are fixed in this branch (and then merged to the trun...
Hi, I have stumbled across an unusual problem whilst attempting to menu merge with Mdi. Basically, I have an MdiParent form which I have created in one solution, it will be the parent of a variety of MdiChild forms, which I have created in other projects and solutions, which will be referenced too in the MdiParent Project, the reference...
I'm co-developing a vehicle information system that reads and presents data from a communication bus. Signaling information on the bus is stored on some kind of database (from the dark ages i'd guess) from which it's only possible to get data out of by extracting a xml-snapshot. Since that wasn't bad enough, someone in upper management t...
OK, so I am implementing an SVN repository to track development on a Dot Net project. I have defined the repository directory in accordance with the following structure: \project \trunk \branches \systest \production \tags \production_yyyymmdd Main development is committed to the trunk of the proje...
Hi, The question may be not very clear as I'm not looking for a solution of a problem but rather seeking to avoid possible problems in the future. Say we have projects A B and C, B and C are based on different baselines of A. Is it ok to do merges between B and C in both directions from B to C and vice versa, wouldn't it create problem...
Hi all, I have a complex MySQL problem. SELECT * FROM banners, content_id_country, languages WHERE content_id_country.content_id = banners.id AND content_id_country.controller = 'banners' Gives me a long result back. The result is perfect, there is only one problem. Some rows are duplicates, so they have only one field c...
I've just started using git, been used to bzr in the past. Here is my problem: I have a git repo (let's call it "default") with files A, B, and C. (I actually update others' modifications with svn.) I clone that repo to "defaultmods" and add files D, E, and F. I notice that someone updated A and C and added file G so I want those file...
I watched the YouTube presentation Tech Talk: Linus Torvalds on git a few weeks ago and one remark seems to be stuck in my mind. In this presentation (around minute 33) Linus says something along the line of "Some people clone a SVN repository, do merging (=headache in SVN) and then push the result back to SVN.". The thought that I ha...
Part of the team is working on next release / sprint, the rest working on testing and bug fixing the previous sprint before a release to production. The part working on next release wants the branch now, the other part wants it as late as possible because they will have to start merging fixes as soon as we branch. I don't like making...
We employ a model where we have on integration and one common development stream per UCM project. Project A is the trunk. Project B is a branch of project A created on baseline BL1 of the integration stream of project A. The development stream of project A has been later rebased using using baseline BL2 in the integration stream. So BL2 ...
I have two arrays which I'm trying to merge based on the date of them. Here is what the arrays look like: $a[0][0] = '11/15/08'; $a[0][1] = '50'; $a[1][0] = '11/20/08'; $a[1][1] = '75'; $a[2][0] = '01/04/09'; $a[2][1] = '23'; $a[3][0] = '01/09/09'; $a[3][1] = '92'; and $b[0][0] = '01/04/09'; $b[0][1] = '30'; $b[1][0] = '01/05/09'; $...