revision

I'd like to hear from people who are using distributed version control (aka distributed revision control, decentralized version control) and how they are finding it. What are you using, Mercurial, Darcs, Git, Bazaar? Are you still using it? If you've used client/server rcs in the past, are you finding it better, worse or just different? What could you tell me that would get me to jump on the bandwagon? Or jump off for that matter, I'd be interested to hear from people with negative experiences as well. I'm currently looking at replacing our current source control system (Subversion) which is

So I've been working on a wiki type site. What I'm trying to decide on is what the best algorithm for merging an article that is simultaneously being edited by two users. So far I'm considering using Wikipedia's method of merging the documents if two unrelated areas are edited, but throwing away the older change if two commits conflict. My question is as follows: If I have the original article, and two changes to it, what are the best algorithms to merge them and then deal with conflicts as they arise? Kyle Wiens Bill Ritcher's excellent paper " A Trustworthy 3-Way Merge " talks about some of

I am trying to update my Android SDK Tools to 17 rev. and I updated usign SDK Tools but in Properties/library ; But the fact that in the support folder there is a annotations.jar already. What should I do to fix it? I had the same problem. I went to the SDK Manager within eclipse (Window --> Android SDK Manager) and installed the Android Support package which is found in the Extras folder. After the install the error was gone (at least in my system) So, when i updated sdk to L version i had same problem. But after Extra folders updating in SDK Manager i didn't find annotation.jar file. Maybe

I have a python project under SVN, and I'm wanting to display the version number when it is run. Is there any way of doing this (such as automatically running a short script on commit which could update a version file, or querying an SVN repository in Python?) I'm not sure about the Python specifics, but if put the string $Revision$ into your file somewhere and you have enable-auto-props=true in your SVN config, it'll get rewritten to something like $Revision: 144$. You could then parse this in your script. There are a number of property keywords you can use in this way . This won't have any

Is there a good way to use git to identify all the modified functions in each revision in the history? I've tried using the -p switch, but it doesn't seem to work in the same way that svn's show-c-function parameter works. My assumption is that I'll want to use "git diff HEAD~i HEAD~i-1 -p" for increasing values of i. Am I missing some parameters that will help identify diff's best guess on the functions that were modified? Here's a quick and dirty attempt at what I think you're going for. It does a git log to show all revisions, -p to include the diff in the log, a grep to only include the

I´m running a linux android sdk installation and my new project needs Build tools 21.1.1 Somehow, this build tools do not exist, eventhough my sdk is up to date, but in the build-tools folder there is now android-4.4W folder android update sdk --no-ui My sdk/build-tools folder I´ve moved the content testwise to a 21.1.1 folder, but this isn´t recognized either. Is this a bug?How to I get the right build tools? What worked for me was: android list sdk -a Which showed me the following list: 1- Android SDK Tools, revision 24.0.2 2- Android SDK Platform-tools, revision 21 3- Android SDK Build

I'd like to implement a way of recording the version of a project within code, so that it can be used when testing and to help track bugs. It seems the best version number to use would just be the current revision number from Subversion. Is there an easy way to hook this number into a (C++ in my case) header file or something, which I can then get at in code? I guess this is a post commit hook or something? Does anyone have any experience of implementing this (with code to share, please?), or can suggest a better alternative? Thanks. While nifty, the revision keyword trick only updates the