Hi, in windows I am able to use winmerge as the external diff tool for hg using mercurial.ini,etc. Using some options switch that you can find in web(I think it's a japanese website) Anyway, here for example: hg winmerge -r1 -r2 will list file(s) change(s) between rev1 and rev2 in winmerge. I can just click which file to diff but...
Hi, In our company we are currently using CVS for project documents, status reports etc, shared folder for installables/product documentation etc and some teams use Wiki (I don't know for what?). Now, I am confused as to where to put what. It would be great if could describe what tools you use in your setup and for what purpose. EDIT: ...
I teach the third required intro course in a CS department. One of my homework assignments asks students to speed up code they have written for a previous assignment. Factor-of-ten speedups are routine; factors of 100 or 1000 are not unheard of. (For a factor of 1000 speedup you have to have made rookie mistakes with malloc().) Progr...
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...
I'm thinking of asking my students to use git for pair programming. Because student work has to be secret, a public repo is out of the question. Instead, each student will have a private repo they maintain themselves, and they will need to exchange patches using git-format-patch. I've read the man page but I'm a little unclear which p...
I develop a variety of applications and have 3-4 miscellaneous libraries that I reuse across these apps (one for math, one for database functions etc.). Currently I have one master source directory with each project as a top level directory (including my helper projects). And each project that needs a helper adds the entire project as a...
I use svn:externals to reference several open source projects. I then make some local changes to one of these external projects. Obviously I cannot check these changes back into the external repository. How do I keep these changes in my repository while still maintaining the ability to easily incorporate external changes? Git makes this...
I'm just learning how to do things, and want to start using some sort of version control for a web app. What's most appropriate for deploying a python or php web app on my own? I'm using linux and have a linux server. Thanks! ...
I personally used Mercurial and Subversion in a limited way and I just can't see why 95% of the people will chose SVN over something else. Is it just a monopoly case or is there a lot of good hidden in SVN that other systems don't have? ...
What is the best way to make one of the branches of a subversion repository the new trunk? There has been a major rewrite for the entire system: things have been moved around, rewritten, replaces, removed, renamed etc. The rewritten code has been tested and is ready to replace the old trunk. Basically, the the old mainline (Trunk 5) ...
Let's say I checked in a changelist (in Perforce) with lots of files and I'd like to revert the entire changelist. Is there an easy way to "revert" the entire changelist in one fell swoop? Currently I do something like this for each file in the changelist: p4 sync //path/to/file#n (where "n" is the previous version of the file) cp fi...
Is there any way to do it? I only have client access and no access to the server. Is there a command I've missed or some software that I can install locally that can connect and find a file by filename? ...
I'm administering a svn repo for a project where the source wasn't imported with a single top level directory. As a result, there are about 15 separate 'projects' instead of one. How can I merge these into one folder while maintaining the change history? *hint: svn move doesn't work in this case. [edit] whoops, dupe of http://stackover...
I've been given an early Christmas Present: Permission to step out of the development cycle to reorganize and document our application. I have complete freedom to restructure, refactor, and set up any amount of infrastructure I see fit. I'm hoping to draw on the collective StackOverflow wisdom wrought in greater experience and s...
I have a Visual Source Safe repository, and some (not all, alas!) of my releases are identified by label. I know how to get by label from the command line, but: Can I get by label from within Visual Studio? I'm using Visual Studio 2003 (would the answer be different in other versions of Visual Studio?). Thanks. PS. I am hopin...
It's not uncommon for me to record a patch, pull it into my staging branch and then realize I've done something small and silly like a typo in a logging message, or something similarly trivial which doesn't require (to my mind) a whole new patch. In these instances, I've been using: darcs amend-record To update the patch. But when I...
Example: $ svn copy foo.txt bar.txt A bar.txt When would you use this technique, and why? Will this command (taken from svn's "red book") creates a copy of <foo.txt> while preserving the history of it to be shared with <bar.txt>? If I'm changing <bar.txt>, what will happen to <foo.txt>? What are the equivalents to thi...
I've had a look on google for alternate providers for the new GDR but couldn't find any. Does anyone know of a MySQL project that is attempting to create a provider? ...
We recently had a project where we released beta of a big web app on our client's server. Our client requested us to do bug fixes as they come, and we tried to do it same way. Normally while building an app on our prototype server is way easier, as I just have to issue simple 'svn up' command which takes a second. But on production env...
Which eclipse files is it appropriate to put under source control, aside from the sources obviously. In my project, specifically, I'm wondering about: .metadata/* project-dir/.project project-dir/.classpath project-dir/.settings/* If there are any of these for which is depends, please explain your guidelines. ...