There are two different concepts here – one is “can the version control system make some intelligent judgements about the contents of files?” – so that it can store just delta information between revisions (and do things like assign responsibility to individual parts of a file). The other is ‘do I have a file comparison … Read more
I actually wrote a one of the blame implementations out there (Subversion’s current one I believe, unless someone replaced it in the past year or two). I helped with some others as well. At least most implementations of blame don’t do what you describe: Usually in blame for each line you look at the complete … Read more
You can can change the default behaviour of log: in your ~/.hgrc (or somewhere/Mercurial.ini), add [alias] log = log -f I’ve read the appearance of the log is for speed reason. Move isn’t truly a “first level” operation in Mercurial. It’s a copy + delete (this compared to Bazaar where the move/rename is a “first … Read more
hg checkout and hg update are aliases for each other, so can be used interchangeably. From the help for hg update: hg update [-c] [-C] [-d DATE] [[-r] REV] aliases: up, checkout, co update working directory (or switch revisions) -C or –clean option is used to throw away uncommitted changes when switching.
Version control is necessary but not sufficient for configuration management. Version control happens in some central or distributed repository, but says nothing about where any particular version is deployed or used. Configuration management worries about how to take what is in version control and deploy that consistently to the appropriate places, primarily QA and production, … Read more
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
Go to Source Control Explorer, right click on the folder you are interested in and choose compare. This will show both files that are not added and also files that have been modified without checking out first. This solution does not require Power Tools
For reference, that .gitignore file can be found here: /bootstrap/compiled.php /vendor composer.phar composer.lock # Remove this one after you create a project .env.*.php .env.php .DS_Store Thumbs.db As noted in the below comment, you probably want to commit composer.lock in your project. Laravel ignores it by default so the authors of the laravel/laravel package don’t accidently … 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.