I would like to mod an open source project held in SVN. I would like to use Mercurial to hold my mod in version control. (The reason for Mercurial is that I would like to keep track of changesets so that I can split up the mod into components - this is necessary for working with the OpenCart project for example as it doesn't support ext...
I've been using Git reasonably successfully (perhaps that's an optimistic evaluation) for going on 2 years now, but have admittedly been doing so somewhat blindly. For whatever reason, I've begun to get much more curious about the internals and have been digging into remote tracking branches of late. They make sense on the whole, but I'm...
I can't make git push origin B. I have situation something like this _____________________________________ A \ \ _____origin/B \ / \___________/____________. B\ \______________ ...
This is a best practice question, and I expect the answer to be "it depends". I just hope to learn more real world scenarios and workflows. First of all, I'm talking about different changes for the same project, so no subrepo please. Let's say you have your code base in an hg repository. You start to work on a complicated new feature A...
I have read nice things about "branch" in Git recently. It seems like Mercurial's way may be to clone a local repo? But Mercurial has branch too. Does it work as nice as Git? What about saving disk space in Mac / Linux / Windows? Do they all do links on Mac and Linux but make a copy on Windows? ...
This is a cousin question with my earlier question of "How to manage concurrent development with mercurial", which covers individual developer workflow. The answer to this question will actually influence the choice for developer workflow. This is NOT a general "release management best practice" or CI question, as it has been asked many...
I have the habit of diff'ing all the changes I made before pushing to any repo. But I found that if I never commit for that period of development, such as for 5 days, then I can merge with other people's code, do testing, etc, and I can diff or kdiff3 and see all the changes I made, remove any debug code, fix any small things, and then ...
I'm working on a project where I have a commit that introduced a feature with major problems that weren't discovered immediately. Now I want to completely remove that revision while keeping the work following it but i'm having a hard time wrapping my head around this 3 way merge. Here is a simplified graph of my project. o changeset: ...
We are a small, in-house development team (5 people) who are developing a few Joomla (PHP) components for release. We need a version control system of some sort (preferably with some soft of integrated bug tracking) and none of us have any experience. We currently all simply work on the same files on a central development server but ne...
Considering switching to Mercurial? We are too. I'm currently studying the benefits of DVCS which turn out to be vast, lust and must. I would love to hear from the community typical usage patterns. Let's create a "Top (te)N" productivity feature list for DVCS (based on Mercurial, or alike). Please describe work flows that prove to be...
Hi, i created a folder common with a bunch of source files and folders But i want now to move the common folder into the include folder so it looks like include/common i tried doing 1) git add include 2) git mv common/ include/ but it fails with this error fatal: bad source, source=myrepo/common, destination=myrepo/include 3) i...
Hi, i've modified several files in a folder and subfolders. I could add the top folder recursively but then i have several subfolders that are untracked, so every time i do the recursive add to stage changes, i have to untrack the subfolders with git rm -r --cached. Is there a better way to just stage the modifications that show up in g...
Mercurial has an hg copy file file2 command and the change can propagate change at the first merge. The O'Reilly Mercurial book says that Mercurial is the only source control system that does that. What is a practical use of this? The book mentioned making a copy of the file and do bug fix, so the bug fix can propagate back to the ...
I read that discussion about the content of "~/.gitconfig" on Linux: http://stackoverflow.com/questions/267761/what-does-your-gitconfig-contain I know some Mac specific optimizations, such as using "mate" as default editor: [core] editor = mate -w or using opendiff as diff editor: [diff] external = opendiff Do you know oth...
Mercurial provides the command parents to examine a given revision's parent(s). This can easily be used to Traverse the DAG backward. I need to traverse the DAG forward. Is there a hg children command? ...
Subversion works great when we have access to central repository, but sometimes two or more developers work at client where they do not have connection to central repository. I am looking for DVCS that can help us where off-line. It should: cooperate with Subversion repository so developers can checkout before leave, commit locally wh...
In the answer to this question, Ry4an states that "you cannot push Changeset2 without pushing Changeset1". This certainly makes sense if the repository looks like this: + Changeset2 | + Changeset1 | + Original However it doesn't seem to make as much sense in the following scenario, which is what I currently have: + Changeset2 | | ...
Is there a way to enable color support for Mercurial in Powershell on Windows 7? The ColorExtension page says to add [color] mode = win32 to your .hgrc file, but it doesn't seem to make a difference. Running hg status shows several files that have not yet been added to the repository, and I believe they should have a pink color (bas...
Say I commit some changes to a new local named branch called 'X'. Then I commit some other changes to my 'default' branch. Can I push only the changesets on 'default', but not the changes on 'X'? Might my approach be wrong? If so, please offer criticism. ...
Let's say I create a repository, add x files to it and commit. Say the size is a Mb after the initial commit. Is there any way to estimate how large the repository is going to be in one years time? If the lines of code has increased by 10%, will the repository have grown accordingly? How does number of commits, branches, tags etc. fac...