Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-diffdir @ 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 7544700fd931
children 096f1c73cdc3
line wrap: on
line source

#!/bin/sh

hg init
touch a
hg add a
hg ci -m "a" -d "1000000 0"

echo 123 > b
hg add b
hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
              -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/"

hg diff -r tip | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
                     -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/"

echo foo > a
hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
              -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/"