Mercurial-nexj

Continuous Integration Project - Mercurial

Introductions & Tutorials

Main website @ http://mercurial.selenic.com/

Mozilla Mercurial @ https://wiki.mozilla.org/Mercurial_on_Windows

compare version control tools [1]

Understanding Mercurial @ http://mercurial.selenic.com/wiki/UnderstandingMercurial

Tutorial-wiki @ http://mercurial.selenic.com/wiki/Tutorial

Installation

Installing in windows[2]

More about installation [3]

Mercurial on Eclipse

Eclipse-Mercurial [4]

Eclipse-Mercurial Video [5]-Demo

Documentation for Eclipse-Mercurial [6]

Notes

The Definitive Guide, is a documentation for hg (PDF or Html).

TortoiseHg Documentation [7]

Creating a Version Control Repository [8]

Mozilla Mercurial [9]

• Some Basic Terms (from The Definitive Guide)

1- The .hg directory is the “real” repository, and all of the files and directories that coexist with it are said to live in the working directory.

An easy way to remember the distinction is that the repository contains the history of your project, while the working directory contains a snapshot of your project at a particular point in history.

2- The hg log command gives us a view of the history of changes in the repository. By default, this command prints a brief paragraph of output for each change to the project that was recorded.

Each of these recorded events are called a changeset, because it can contain a record of changes to several files. Changeset is also referred to aschange,cset,revision or rev.

3- Changeset field has the format of a number (identifier, which is only valid in that repository) followed by a colon, followed by a hexadecimal (or hex) string. These are identifiers for the changeset.

The hex string is a unique identifier: the same hex string will always refer to the same changeset in every copy of this repository. The number is shorter and easier to type than the hex string, but it isn't unique: the same number in two different clones of a repository may identify different changesets. changeset: 0:0a04b987be5a

4- Mercurial uses revision numbers purely as a convenient shorthand. If you need to discuss a changeset with someone, or make a record of a changeset for some other reason (for example, in a bug report), use the hexadecimal identifier.

5- Some changesets, have a tag field. A tag is another way to identify a changeset, by giving it an easy-to-remember name. tag: tip

6- To get the changeset id of the tipmost changeset of a remote repository you can do: When it changes, you have new changesets in the remote repository.[10]

> hg id -i -r tip http://www.selenic.com/repo/hello 
[[[link-to-a-page]]]
[url=http://example.com]Example[/url]
82e55d328c8c

7- Some aliases:

st = status / ci = commit /

8- mq tutorial [11]

9- ant task for hg ANT4HG

• Branch & Merge

To create a new branch: hg branch ws

Then commit it: hg ci -m 'added branch ws'

To see all branches: hg branches

To switch between branches: hg update ws

To clone a branch to local directory: hg clone -b ws work workCopy/work

After commit a change to the copy of code, just push it hg push, it will be pushed to ws branch in main repository

In main repository if you want to merge these 2 branches first see how many heads you have hg heads

Then merge with the revision of the branch you want to merge with: hg merge -r 3

Don't forget to commit this merge!

Challenges

• 1- First challenge is how to trim history of a repository.

We have a Mercurial repository called A. We want to clone repo A and create a new repo called B.

It's possible to use 'init' and create a new repo and just copy the files from repo A and add them.

This way the revision number will reset. And we will start repo B from the tip of the repo A.

The problem appears if we want to clone just the tip of the repo A and keep the same revision number of the 'tip'.

Here are some links that we went through, but no success yet.

Trimming History

.hgrc file

mq strip changeset

Editing History!!