Все вопросы: [dvcs]

128 вопросов

похожие теги:
521
голосов
11ответов
40177 просмотров

Git and Mercurial - Compare and Contrast

For a while now I've been using subversion for my personal projects. More and more I keep hearing great things about Git and Mercurial, and DVCS in general. I'd like to give the whole DVCS thing a whirl, but I'm not too familiar with either option. What are some of the differences between Merc...

2173
голосов
14ответов
852727 просмотров

How do I show the changes which have been staged?

I staged a few changes to be committed; how can I see the diff of all files which are staged for the next commit? I'm aware of git status, but I'd like to see the actual diffs - not just the names of files which are staged. I saw that the git-diff(1) man page says git diff [--options] [--] […] T...

1
голосов
1ответов
96 просмотров

Push DVCS repository to master without needing codebase

To work on a client's staging environment I have to connect through a VPN which locks all normal network traffic and prevents any connection to the Internet. This would immediately prevent any of the "normal" VCS solutions from being used as it's not possible to gain access to the server. A solu...

8
голосов
2ответов
2938 просмотров

GIT: Appending a patch made after a few commits

I use git to keep track of changes made by our development team and committed into our central cvs-style repository. Since its cvs, it keeps track of files and not commits, making it sometimes difficult to tell exactly what files constitute the full patch for a bug fix. I just came across one a...

8
голосов
3ответов
236 просмотров

Can 'git status' be configured so that it won't provide help text?

Is there a way to configure Git to remove the dead wood from the git status command? Instead of this monstrosity: # On branch master # Changes to be committed: # (use "git reset HEAD <file>..." to unstage) # # new file: README # # Changed but not updated: # (use "git add <fi...

5
голосов
4ответов
1651 просмотров

In git, what are some good conventions to format multiple comments to a single commit

I was wondering how people normally separate out the multiple comments in a single commit. Stars? Commas? Separate lines? Just wondering what you find to be the best. I'm using this now when I add comments via Emacs, but not sure I like it: Added error messaging Cleaned up sign-up UI Added rec...

29
голосов
7ответов
10201 просмотров

Git versus Mercurial for .NET developers?

I've been wondering what is the better DVCS for .NET developers? From reading various information it has sounded like Mercurial works better on Windows, but other information claims that Git has caught up and surpassed Mercurial in offering quality Windows and Visual Studio tools. Does anyone h...

30
голосов
5ответов
5664 просмотров

DVCS - How often and when to commit changes

There is another thread here on StackOverflow, dealing wih how often to commit changes to source control. I want to put that in the context of using a DVCS like git or mercurial. How often and when do you commit? Do you only commit changes when they build correctly? How often and when do you p...

27
голосов
6ответов
1848 просмотров

Managing aesthetic code changes in git

I find that I make a lot of small changes to my source code, often things that have almost no functional effect. For example: Refining or correcting comments. Moving function definitions within a class for a more natural reading order. Spacing and lining up some declarations for readability. Co...

1
голосов
2ответов
1101 просмотров

How to merge remote master at two commits earlier than current local master

Steps Leading up to Question Here's what I did leading up to my question: Forked a project on Github and cloned it locally Made two commits to my local repo to fix a bug Pushed those two commits to my forked Github repo Sent a pull request via Github to the original repo owner Original owner m...

78
голосов
3ответов
94778 просмотров

Git create branch from current checked out master?

There is a git controlled folder on a server where the main branch is checked out and a whole pile of files have been modified and not committed. Is there a way for me to commit the changes to a separate branch so I can go back to a clean version? ie I want to effecitvely undo all this persons...

6
голосов
3ответов
2997 просмотров

Is 'pull' a synonym for 'clone' in a Mercurial source-control repository?

I'm seeing the command 'pull' and wondering how that's different from a 'clone'. Both terms seem to imply retrieving code from some remote repository. Is there some subtle distinction here?

17
голосов
7ответов
7518 просмотров

Is there a free private Bazaar online source host?

I am looking for a free private online Bazaar source host. Does anybody know of any? I had a quick look and it seems there are lots of Git, Mercurial, and SVN options, but no Bazaar? Just to clarify, when I say "private" I mean in the sense that you get your own private repository where you can ...

3
голосов
2ответов
169 просмотров

Clarification on using VCS such as Git

I understand the basic and how the workflow works and what not. However, let's say I have a local repository on my linux workstation. Now, I also have a production box located on a VPS in a remote DC. If I wanted to push out new code to the production box, what's the best way to do so? I don't wa...

165
голосов
5ответов
65605 просмотров

How can I see incoming commits in git?

Possible Duplicate: Using Git how do I find modified files between local and remote How can I see incoming commits in git? Or even better, see what I just git fetch/git pulled? Edit: To clarify the question: someone tells me that, to get some fixes, I should pull from their reposito...

7
голосов
6ответов
1637 просмотров

Multiple simultaneous version control systems?

I'm relatively new to version control, and so far only have experience working with Subversion using TortoiseSVN/VisualSVN. I've been reading about other types of VCS (git, mercurial, etc), and am considering trying them out - however, many of the arguments for or against a particular VCS seem li...

1
голосов
3ответов
367 просмотров

Which DVCS would work best on Windows for my scenario?

At work I use ClearCase and SourceSafe, but have found some time to do some time to code for myself enroute thanks to a disposable laptop. However, I wish I had a lightweight VCS on my system using which I would be able to make changes to my code during the commute and then push/grab them from m...

14
голосов
9ответов
8477 просмотров

git: how do I merge between branches while keeping some changesets exclusive to one branch?

There's a special place in hell for people who hardcode absolute paths and database credentials into multiple random places in web applications. Sadly, before they go to hell they're wreaking havoc on Earth. And we have to deal with their code. I have to perform a few small changes to one of su...

50
голосов
4ответов
21369 просмотров

How do I manage large art assets appropriately in DVCS?

Is there any good way to handle large assets (i.e. 1000's of images, flash movies etc.) with a DVCS tool such as hg and git. As I see it, to clone repositories that are filled with 4 GB assets seems like an unnecessary overhead as you will be checking out the files. It seems rather cumbersome if ...

8
голосов
7ответов
1259 просмотров

Migrating away from Clearcase

We are migrating from Clearcase to another VCS (probably either SVN or Mercurial). For companies that have made this transition, what factors did they find important in selecting another VCS tool, and what practices did they find eased the transition?

32
голосов
5ответов
3774 просмотров

Are DVCS like Git inappropriate for teams using continuous integration?

My team's development processes are based on continuous integration. The only branches we create are maintenance branches when we release, but otherwise developers are expected to commit regularly (daily if not more often) to trunk, so that everyone's work is always integrated, continually tested...

2
голосов
10ответов
1109 просмотров

When it comes to developing for the IPhone, should I use Git or Subversion?

It sounds to me like subversion's centralized model works better for web application development where you have a team of engineers working currently on the same code base and releasing constantly. On the other hand Git's distributed model is appealing for an IPhone app because 1) I dont' need a...

0
голосов
1ответов
154 просмотров

How do I configure tortoisehg to show copied files in the log (i.e. use the hg "-C" option)?

I want to easily tell which files where renamed when looking at the changelog using the tortoisehg UI. The out-of-the-box config only shows that a file was added/removed (i.e. the standard hg log message without the -C option).

8
голосов
1ответов
2067 просмотров

Does Git treat add/remove as a rename?

This may be more appropriate as an issue in whatever issue tracker/forum Git uses, but I thought I'd get an SO confirmation/explanation first: I have a repo tracking a bunch of installer executables. Let's say foo-1.0.exe is already in the repo. I now add foo-2.0.exe in the same directory (git...

14
голосов
2ответов
8239 просмотров

Seeing what revision goes with a tag in Git

Beginner Git question: In the Mercurial world, hg tags gives me a list of tags and the corresponding revisions, whereas git tag only lists the tag names. How do I see what the matching rev number/hash is?

16
голосов
4ответов
20367 просмотров

bitbucket, "hg push" and "hg update"

If I start out with a local mercurial repo, which I consider to be the "main" repo (pardon me my dvcs lords), and intend to use bitbucket as a backup and issue tracking facility, I can do all my changes in my local repo and do an "hg push" to send the changes back to bitbucket. Don't I need to f...

0
голосов
2ответов
532 просмотров

How can I put a WebDAV filesystem in my DVCS when I can't write to the root?

I have WebDAV access to a filesystem where I can't write to the root of the filesystem, but can write to 2 folders beneath it. I'd like to: track my changes in a single DVCS repo (git/hg preferred) work directly on the WebDAV connection rather than constantly pulling changes into it (this would...

5
голосов
3ответов
218 просмотров

DVCS and data loss?

After almost two years of using DVCS, it seems that one inherent "flaw" is accidental data loss: I have lost code which isn't pushed, and I know other people who have as well. I can see a few reasons for this: off-site data duplication (ie, "commits have to go to a remote host") is not built in,...

10
голосов
4ответов
4128 просмотров

Pros and cons of distributed revision control systems?

What are the advantages and disadvantages of distributed revision control systems? If you have any experience with distributed systems like Git, Mercurial, Plastic SCM, etc. please share your experience. Tell us what worked well and where problems arose. I'm particularly interested to hear abou...

64
голосов
5ответов
42458 просмотров

How do I "switch" with Mercurial

How do I do what svn switch does, in Mercurial? That is change my working directory to switch to another branch in the repository?