This is what I was looking for. Add the following to the repo’s .hg/hgrc: [ui] ignore = /path/to/repo/.hg/hgignore and create a new file .hg/hgignore beside it. This new file will be untracked, but work the same as the versioned .hgignore file for this specific working copy. (The /path/to/repo bit is unfortunate but necessary to make … Read more
Git is about tracking changes. It relies on you to tell it which files are important enough to track. You can achieve the desired affect like so: git add . ;git commit -a Make sure your .gitignore file is updated.
Other people have made very good cases for not making changes directly in master, and I agree with them. However, always advocating workflows like this sometimes leads people new to git to believe it is needlessly complex, so I wanted to provide a counterpoint. If you have a one-person or very small team and your … Read more
Here’s an answer from one of the Kiln developers. It provides real branching. It’s easy to use. Windows support is very good. It’s fast. It’s powerful. It’s easily extensible. Check out the full details here. They explained themselves quite thoroughly.
Yes you can. I’m sure you’ve moved on, but for the sake of those who will wander here later, I followed the docs at ConvertExtension, and wrote a simple batch script: @echo off echo Converting %1 REM Create the file map echo include %1 > ~myfilemap echo rename %1 . >> ~myfilemap REM Run the … Read more
There’s nothing in particular in DVCSs that makes merging easier. It’s simply cultural: a DVCS wouldn’t work at all if merging were hard, so DVCS developers invest a lot of time and effort into making merging easy. CVCS users OTOH are used to crappy merging, so there’s no incentive for the developers to make it … Read more
This is what I use, and I think you’ll want to as well. It’s close to the other answers, but instructs git to NOT change the local files. git rm -r -f –cached DirectoryName -r : recursive -f : force –cached : apply ONLY to index (staging area). Git leaves the local copies alone.
You can use git request-pull to achieve the same kind of workflow (which is improved with Git1.7.9+). See the article “using signed tag in pull-requests” A typical distributed workflow using Git is for a contributor to fork a project, build on it, publish the result to her public repository, and ask the “upstream” person (often … Read more
These are some thoughts I’ve had on this matter of subject. In the end you may need to keep assets and code as separate as possible. I can think of several possible strategies: Distributed, Two Repositories Assets in one repo and code in the other. Advantages In web development context you won’t need to clone … Read more
It is correct that you cannot easily remove a particular file from Mercurial in the sense that doing so will disrupt all the changeset IDs in your repository. When you change the changeset IDs, everybody has to re-clone the repository. See the Wiki page about editing history for information about the consequences of modifying the … Read more