I am new to this forum but i found very quick responce from active developers.
i have query with technical diffrence between "GIT" and Tortoise "SVN". if any one has work on it please give me detail description.
thanks
tousif shaikh.
You mean surely a difference between Git and svn? Tortoise is just a GUI for (mostly) svn.
Take a look at this wiki article: https://git.wiki.kernel.org/index.php/GitSvnComparison
or at this thread: https://stackoverflow.com/a/161572/1758762 :
SVN is one repo and lots of clients. GIT is a repo with lots of client repos, each with a user. It's decentralised to a point where people can track their own edits locally without having to push things to an external server.
SVN is designed to be more central where GIT is based on each user having their own GIT repo and those repos push changes back up into a central one. For that reason, GIT gives individuals better local version control.
and so long ...
SVN workflow:
The trunk directory represents the latest stable release of a
project.
Active feature work is developed within subdirectories under branches
When a feature is finished, the feature directory is merged into
trunk and removed.
Git workflow :
A Git repository stores the full history of all of its branches and
tags within the .git directory.
The latest stable release is contained within the master branch.
Active feature work is developed in separate branches.
When a feature is finished, the feature branch is merged into master
and deleted.
Related
How can you make multiple clones of the same repository on your local computer with GitHub Mac Desktop? After you make the first clone, the repository name disappears from the GitHub Desktop clone choice list.
Related to this, I cloned a GitHub repository onto my local machine, then decided I didn't want it in that location. I simply deleted (trashed) the old repository and tried to clone it again, but could not, because the repository name was not listed. It turned out that because the repository was still in the trash, GitHub Desktop didn't recognize it as gone. I emptied the trash and it saw that it was gone and asked if I wanted to remove the repository. I answered YES and then the repository name appeared in the clone choice list.
You can't clone the same repo twice from the GUI so, instead use command line git clone for that and then you can use the File->Add Local Repository item to select the path and it will show up.
The annoying thing is that having multiple clones of the repo in the Repository List will cause them all to have exactly the same name, because GitHub Mac Desktop doesn't show the paths. Fortunately the order doesn't change and you can always (right click->open in terminal) to see which is which.
If you want to delete a repo that you have cloned - you need to remove it in Github for Mac (right click->Remove) which just removes it from being tracked in the repository list. Now you can delete it from the Finder.
Delete from Finder and then remove from Github for Mac works too.
I'm playing a bit with the new Microsoft.AspNet.Identity but the 3.0.0-beta2 looks very different from the current state of affairs in git. I'd like to build against he git version.
I seem to remember hearing that it possible to reference a git repository directly from the dependencies in project.json. How does one do that? What's the syntax?
There are two options:
Instead of using the NuGet feed, switch to the Nightly feed on MyGet. We produce builds on every checkin from the code in Git. The latest versions on the MyGet feed are beta4-*
Clone the repo and use global.json to point to the sources, as described in this article
Adding a reference directly to a Git repo without cloning it beforehand is not supported.
I imported Apache Nutch source code into my local ubuntu installation. I have subversion installed on my eclipse kepler. The sourcecode has several branches and one main project in trunk. I was thinking of specifying this source-code location as my repo location to svn and check out & or commit changes based off of this. However SVN always seem to expect a remote repo location. Is there anyway I can make this dumping ground of apache nutch source code as my repo location for svn?
Thanks
DVCS systems may help, such as git, Hg, etc.
Subversion is a centerized version control system, all workspaces directly connect to center repository.
But DVCS have local repository, before you commit to remote repository, you need commit to local rep first.
I'm an iOS developer looking to better manage the projects I am creating. I've never touched SCM before so I'm not sure which system to use.
I'd like to keep track of changes to the different apps I'm making for my boss, but also have them in a centralised place, and be able to branch off and be working on features separate from the main app and then merge the changes back in when I'm finished. All of this will be done locally (stored on an external hard disk in my office), and once versions are complete I'd like to be able to export a copy without the SCM features to send to my boss.
I've just upgraded to Xcode 4 and noticed Git is built in. I played around with both Subversion and Git, but it sounds like Git is what would fit my needs better. However, it seems to be totally different to Subversion. The Xcode 4 documentation suggests Git is best for lone developers, but that doesn't seem the case. If the git repository is inside your working copy, how on earth do you make branches of it? Where do you send your changes to? Do you copy the entire working directory and use that as your branch?
Just looking for someone to explain in plain english which SCM system would be best for a lone developer to use and any tutorials people may know of to help me understand it.
Thanks for any help!
Go for git!
The repository actually resides in your working directory. There is .git folder which contains all the data about your branches and commits and whatsoever. You can create a bare repository(only the contents of the .git folder) if you like but having both in the same place is nice, especially if you are a single developer who doesn't need distribution.
Branching in git is very easy:
# create the branch
git branch mybranch
# switch to branch
git checkout mybranch
# show branches
git branch
Git does not depend on a server like svn does. You can have distributed development by using remotes but this is not necessary.
If you like to make a copy for your boss without the git files in it do a
git archive branchname --format=zip -o tree.zip
I suggest some reading on git
Git in five minutes
Git Community Book
The Thing About Git
Branching in git is very different from SVN. Branching happens in place, in stead of in another directory.
Read this book and other resources to get a better understanding about how git works
About the centralized server, Git is a decentralized SCM. That means that every clone contains the entire repository, not only the current working directory.
That doesn't mean you can't have a central repository. On the central server you create a bare repository, and on you're local machine you clone from that repository, push and pull from that repository, often through ssh.
Ok, perhaps I'm trying to accomplish something not doable.
I am a single developer (not part of team).
I'm trying to get some kind of versioning system going. I had used CVS with XCode 3, but XCode 4 no longer has that as an option. I've heard that SVN and Git are better alternatives anyway.
Basically, I've wasted more than half a day trying to get XCode to work with SVN / Git out of the box. I do not have a server running, and would rather not expose my project on a server.
It doesn't make sense for me to have a separate user just to run the Git/SVN Servers, either.
I'm just trying to have version control using either one, in the simplest possible way.
I've tried to add Repo, using local file path (/Volumes/AAA/BBB/Repo) where I manually created the "Repo" directory. I've set the type as Subversion (and also tried Git). XCode says "Host is reachable". But, the Commit functionality is not there (Disabled). I can't import my working directory.
I just don't get it - must I have a server running in order to have SVN/Git, or can XCode just do it through command line? I much more prefer it being done over command line, since the server is complete overkill. Or, am I missing something? Maybe I'm putting in the wrong settings into XCode?
This isn't strictly an XCode 4 issue, I had the same issue with XCode3, but at least it had the CVS option - now it's gone.
With Git you don't need a central server or even a central repository unless you have multiple people on the project. SVN requires you to have a central repo & server running all the time, but with Git you can simply git init a new repo and start using it. If you don't have a central repo you will never use push, pull, or fetch.
Xcode's help mentions the following:
Choose Git or Subversion Xcode supports two SCM systems: Subversion
(often abbreviated svn) and Git. Subversion is always server-based and
the server is normally on a remote machine, though it is possible to
install one locally. Git can be used purely as a local repository, or
you can install a Git server on a remote machine to share files among
team members. The Xcode 4 installer installs the Git and Subversion
tools when you select System Tools. If you are working alone, it’s
generally easiest to use Git, as you don’t need to set up a server. In
fact, Xcode can automatically set up a Git repository for you when you
create a new project (see “Create a Git Repository For Your New
Project”). For a group project, the choice of Subversion or Git is
usually a matter of taste and prior experience. In so far as is
possible, Xcode provides a consistent user interface and workflow for
users of either Subversion or Git.
So the official advise is that in your case, Git is the easiest solution. I'm now in the same position as you described and will be trying Git as advised.
Previously, when working for a small company, we used a dedicated leftover MacMini as an SVN server; this was quite easy to set up, and worked like a charm for many years. Be aware that the SVN integration of Xcode 3 was better than that of Xcode 4 though, so that I ended up using Xcode 4 for development and basic SVN usage, together with Xcode 3 for SVN stuff that Xcode 4 wouldn't do anymore.