Working tips & tricks with Mercurial on Kiln server.

1. Mercurial (Kiln)
Tips & Tricks

2. Introduction
● Mercurial (Hg) is revision control system
● Kiln is Mercurial repositories server
● TortiesHg is a Mercurial client
* Refer to Working with Kiln and Mercurial for
detailed kickstart guide.

3. Installation & Setup
● FogBugz & Kiln share the same credentials
● Download the Kiln Client for Windows
● Set merge tools - Beyond Compare 3 Pro
● Define your username - Your Name
<name@etoro.com>
● Define post pull update to work on the latest
change in branch
● Create ignore file. Use defaults
● I suggest to work with Workbench only, but
you can try VisualHg VS add-on.

4. Concepts & Terminology
● You are working on a local repository.
● Push changes to server for others
● Pull changes from server to get updated
● Commits are always local.
● Write "case #" in comment on commit to set
link with FogBugz.
● Update is used to set a local repository to
another branch or changeset in order to
work on it.
● "default" is the main branch (like trunk).

5. Feature branch model

6. Branches & Merges
● You can create a new branch in Commit
screen.
● You can make changes and then Commit
them into a new branch by creating it.
● Switching from one branch to another is
done with Update command.
● Merge one branch to another by Updating
to the branch you want to merge the other
branch into and then merge the other
branch.
● If there was a conflict during merge, you will

7. 3 way merge to resolve conflicts

8. Going back in time options
● Rollback/Undo - to rollback a local changes
after a local Commit.
● Revert - to revert back to original changeset
and forget the local changes before Commit.
● Backout - to revert a changeset after
Commit and Push
● Strip changeset - strips a changeset
completely with no audit. Can be done on
Kiln server only.

9. Working with number of branches
● Shelve when you don't want to commit
changes, don't want to lose it and prefer to
save it.
● Clone the same repository number of times
into different folders and update each to
relevant branch.
● Sync feature branch with changes in
"default" (trunk) branch by doing a simple
Merge, but in opposite direction.