Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge4 @ 2795:135823f37304

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
new extension: fetch -> combine pull and merge/update pull changes from remote repo. if changes add new head: merge with new head, commit result. else: update working dir to new head. this makes useful command like git 'pull' command.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Mon, 07 Aug 2006 17:27:38 -0700
parents e506c14382fd
children
line wrap: on
line source

#!/bin/sh

hg init
echo This is file a1 > a
hg add a
hg commit -m "commit #0" -d "1000000 0"
echo This is file b1 > b
hg add b
hg commit -m "commit #1" -d "1000000 0"
hg update 0
echo This is file c1 > c
hg add c
hg commit -m "commit #2" -d "1000000 0"
hg merge 1
rm b
echo This is file c22 > c
hg commit -m "commit #3" -d "1000000 0"