I work on Linux all the time and I'm clueless about Windows not even having one to try it, is Git nowadays working on Windows? or am I making problems for my Windows-pals by using it?
I'm working on different projects with some small teams (2-3 people for each).
Those projects are about some scientific stuff, most (probably all) the code will be released under GPL after the publication of some results and we don't want to spend money for this.
My first question is: should i keep my local SVN server or you know some good service for this?
Both of them have some disadvantages and services like xp-dev.com looks pretty interesting but should i trust them? [i'll get only the free plan]
Online services give you some tools for project management, what do you think about them?
Is there a list of the differences between the various versions of Rails somewhere on the web?
I'm working through an older book about Rails that uses Rails 1.2. I know there are other ways to learn Rails these days, but I thought it would be interesting to try and convert all of the exercises in the book to a more modern versions of Rails (I'm currently working with 2.3.5).
A comprehensive list of differences between the various releases would be very helpful. Note that I don't consider the git log a good source of information, as commit messages almost never tell the full story.
Hi,
my app queries the GPS-speed using .getSpeed() on a LocationListener. Is there a way to set this speed using the Eclipse Emulator Control or the command line? I tried to feed multiple sets of coordinates to the emulator via the manual GPS-control, but it didn't pick up a speed from that. Also, using a pre-defined GPX-file and playing it doesn't work for me.
I would like to test my app without having to take it on a test-drive in my car every time ;)!
Thanks!
Is it possible to create "federated" Subversion servers?
As in one server at location A and another at location B that sync up their local versions of the repository automatically. That way when someone at either location interacts with the repository they are accessing their respective local server and therefore has faster response times.
The worst one I've been caught by was with git submodules. I had a submodule for a project on github. The project was unmaintained, and I wanted to submit patches, but couldn't, so I forked. Now the submodule was pointing at the original library, and I needed it to point at the fork instead. So I deleted the old submodule and replaced it with a submodule for the new project in the same commit. Turns out that this broke everyone else's repositories. I'm still not sure what the correct way of handling this situation is, but I ended up deleting the submodule, having everyone pull and update, and then I created the new submodule, and had everyone pull and update again. It took the better portion of a day to figure that out.
What have other people done to accidentally screw up git repositories in non-obvious ways, and how did you resolve it?
I would like to open-source a python project on Github but it contains an API key that should not be distributed.
I guess there's something better than removing the key each time a "push" is committed to the repo.
Imagine a simplified foomodule.py :
import urllib2
API_KEY = 'XXXXXXXXX'
urllib2.urlopen("http://example.com/foo?id=123%s" % API_KEY ).read()
What i'm thinking is:
Move the API_KEY in a second key.py module importing it on foomodule.py; i would then add key.py on .gitignore file.
Same as 1 but using ConfigParser
Do you know a good programmatic way to handle this scenario?
I have media player control in my web page which that I able to get the media player only in Internet Explorer I can't able get in any other browser like Chrome or Firefox and code is media.aspx.cs:
<%@ Page Language="C#" AutoEventWireup="true" CodeFile="Default.aspx.cs" Inherits="_Default" %>
<%@ Register Assembly="Media-Player-ASP.NET-Control" Namespace="Media_Player_ASP.NET_Control"
TagPrefix="cc1" %>
<cc1:media_player_control id="Media_Player_Control1" runat="server"
Height="314px" Width="518px"
style="z-index: 100; left: 4px; position: absolute; top: 9px">
</cc1:media_player_control>
I have used Perforce previously and in current project we are using SVN. I noticed that it is very slow seeing revision logs and to see its comparisons in SVN relative to Perforce.
Is it because Perforce is a commercial solution or is it something with my SVN client(Smart SVN)?
I mean, we've all done it, making some changes and the checking them in with messages such "as made some changes" or "fixed a bug." Messages so inane, so pointless, you might as well have written "magical fun bus" in their place (of this, I am guilty), as it would be, perhaps, more descriptive. I ask you then, what is the most pointless, most off topic, strangest, or just WORST commit message you have ever authored?
I'm a happy user of PortableGit 1.7.0.2. Today I wanted to pull a project changes from GitHub.com repository, so I did git pull. It failed with the following message: error: Your local changes to 'main.rb' would be overwritten by merge. Aborting.. I didn't care about the local changes so I typed git reset --hard HEAD (git clean from here didn't help neither), but it didn't work. When asked for git status I was still able to see the file as modified. git diff showed me that each line of the file has been modified, while git diff -b showed no differences at all, so I guess this is a line ending issue. Which is strange because the code is only pushed from Windows machines.
Anyway, the question is: how can I ignore the local, bogus changes and merge with the latest changes from the remote repository?
Now that Bitbucket also supports Git repositories, it seams to me that it is a good alternative to GitHub, especially since its free plan includes unlimited private repositories, which is not available on GitHub. Yet, GitHub seams much more popular.
Are there any major reasons to choose GitHub as the hosting site for Git repositories instead of Bitbucket?
(Although I have no problems with making my personal projects publicly available in general, I like the idea of being able to make the switch from public to private or vice versa any time I want. But if there are some good reasons to use GitHub, I would be willing to give up this freedom.)
I can use something like:
cvs.exe rdiff -D2010-03-23 -D2010-03-24 -s "ProjectName"
to get the changes which occurred on the 23rd.
But I want to get the changes that were checked in on the 23rd on a specified branch - and if I add in a -v branchv1-0-0-0 into that it tells me I can't have more than two dates/revisions in one query.
Any suggestions?
I have a user control that wraps a grid. I want to be able to set the underlying grid's data source, but through the user control, like this:
<my:CustomGrid DataSource="{Binding Path=CollectionView}" />
I have set this up in the grid like this:
private static readonly DependencyProperty DataSourceProperty
= DependencyProperty.Register("DataSource", typeof(IEnumerable), typeof(CustomGrid));
public IEnumerable DataSource
{
get { return (IEnumerable)GetValue(DataSourceProperty); }
set
{
SetValue(DataSourceProperty, value);
underlyingGrid.DataSource = value;
}
}
But this doesn't work (it doesn't give me an error either). The data source is never set. What am I missing?
I wanted to remove some files from the repository (while leaving them locally), and stop tracking them in the future.
I tried this:
- Used Tortoise 'Delete - Keep local' on the directory I wanted to remove from versioning.
- Comitted to the repository.
This commit failed with this error: commit failed... item is out of date
Can anyone tell me
a) What the correct procedure is for this?
b) What can I do to get back to a working repository?
Thank you!
Hi,
I am pretty new to iPhone programming.
I have a navBar with three views. I need to control audio from all of the views. I only want one audio stream to play at a time. I was thinking that it would be smart to let my AppDelegate have an instance of my audioplaying class and let the three other views use that instance to control the audio. My problem is that I don´t know how my views can use the audioplaying class in my AppDelegate.
Is this the best approach and if so, how? Is there a better way?
I've been using SVN for some time now, and am pretty happy with how it works (but I can't say I'm an expert, and I haven't really done much with branches and merging). However an opportunity has arisen to put in some new practises on a new team and so I thought I'd take a look at DVCSs to see if it's worth making the jump.
The company I work for is a pretty standard company where we all work in the same location (or sometimes at home) and we want to keep a central store of all code.
My question is: if all you are doing with a DVCS is creating a central hub that everyone pushes their changes to, is there really any benefit to moving to a DVCS and its extra overheads in this sort of environment?
I'm going to ask a newbie question here. I need to use a control I found online in my code, but it was written in the wrong language. It is in C# and I am using VB.net for work. I have all of the code for the control which works beautifully in C#, but I had issues with it not working very well in VB.
The source code and a demo project are available here, but I am not sure exactly which files I should use to build the dll for VB.
It seems a lot to ask, but would someone mind taking a look and pointing me in the right direction?
Cheers
I've just installed Mercurial on my Mountain Lion Max (10.8) and on my first commit I'm getting the error:
abort: no username supplied (see "hg help config")
I've seen a load of answers which suggest I need to create or copy a file form a certain location and paste it into another location and add my username and email to the document.
If that is the right thing to do:
Where is the file I need to copy (or what is the file called that I need to create)
Where do I put that file
Do I just need to add the following two lines to the file?
[ui]
username = Your Name
Thanks guys.
I though it would be very simple but I can not get it today.
I have a user control, with a grid control contained in it.
public Unit Width
{
get
{
return CustomerGrid.Width;
}
set
{
CustomerGrid.Width = value;
}
}
I expose the width property and when I set it in the designer it works at run-time but not design time.
What class do I inherit from or method to override to get my controls to function at design time.
Note I tried to inherit from WebControl but got the message
Make sure that the class defined in this code file matches the 'inherits' attribute, and that it extends the correct base class
When SVN with merge tracking works, it's really nice, I love it. But it keeps getting twisted up. We are using TortoiseSVN. We continuously get the following message:
Error: Reintegrate can only be used if revisions 1234 through 2345 were previously merged from /Trunk to the reintegrate source, but this is not the case
For reference, this is the method we are using:
Create a Branch
Develop in the branch
Occasionally Merge a range of revisions from the Trunk to the Branch
When branch is stable, Reintegrate a branch from the branch to the trunk
Delete the branch
I Merge a range of revisions from the trunk to the branch (leaving the range blank, so it should be all revisions) just prior to the reintegrate operation, so the branch should be properly synced with the trunk.
Right now, the Trunk has multiple SVN merge tracking properties associated with it. Should it? Or should a Reintegrate not add any merge tracking info?
Is there something wrong with our process? This is making SVN unusable - 1 out of every 3 reintegrates forces me to dive in and hack at the merge tracking info.
What is the common way of dealing with the development.sqlite3 files with VCS (in particular, git)?
If I commit this file to the VCS, will it be merged with another developer's copy?
Or should each developer run the db:migrate task each time a new migration file is created?