Added tag 7.2.0 for changeset bf6b859807ba

test-compat: merge mercurial-4.2 into mercurial-4.1

test-compat: merge mercurial-4.3 into mercurial-4.2

test-compat: merge stable into mercurial-4.3

branching: merge stable back into default The test change has to be reverted.

branching: merge further compat change into stable

branching: merge further compat change into stable

branching: merge more compatibility fix into stable

packaging: merge 7.2.0 into stable

tests: update test output to match 4.4 The stable branch is sitll 4.4.

branching: backed out test output changes from core-1905aac253f0 This backs out evolve-ae6fddf39933

branching: backed out test output changes from core-02fdb8c018aa This backs out evolve-1905aac253f0.

compat: fix argument check for marker reading The previous check was broken for 4.2

cachevfs: use a compatibility later for all access

diff: drop default argument value This argument use the default value for an argument not available in earlier version. So we just stop passing the argument.

test: use hash in test-evolve-topic.t This helps testing compat with older version.

packaging: prepare version 7.2.0

changelog: prepare for coming release

stablerange: add missing licence and copyright header

obshistory: pass the csets description in getmarkerdescriptionpatch Previous patches removed any use of ctx in the function and we now just need the cset description in the function. Let's pass that only. This will save couple of calls of repo[node].

obshistory: remove the unused function The function is not used anymore.

obslog: add header to the changeset description diff This patch adds `diff -r <hash> -r <hash> <filename>` header to the output of the changeset description diff which is shown using the --patch flag of obslog command. This fixes the label/color issue for description diff also.

obslog: colorize the description diff shown in obslog -p This patch colorizes the description diff shown in `hg obslog -p`. The labels for the header are different from that of the patch as the main header which says `diff -r <somehash> -r <somehash> <filename>`. Next patch will hack to add that.

obslog: colorize the patch shown using `hg obslog -p` This patch adds color support to the patch shown in obslog command.

topic: suggest using topic when user creates a new head on branch This patch adds a message to use topics when user creates a new head on a branch.

changelog: update changelog with some of the benefit from the new format

evolve: use better words in conflict markers of `hg evolve` Though we call merge.graft internally, we still have the functionality to pass the words we want to show up in conflict markers. So let's use better words here.

tests: add a test demonstrating we still use graft in conflict markers This patch adds a test which shows that we still use the word graft in the conflict markers. Next patch will start using evolve instead of graft.