Mercurial Mercurial > hg / file revision
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-diffdir
author Vadim Gelfer <vadim.gelfer@gmail.com>
Thu, 11 May 2006 09:43:50 -0700
changeset 2264 fdb699b5e132
parent 1933 7544700fd931
child 3199 096f1c73cdc3
permissions -rwxr-xr-x
localrepo.update: abort if outstanding merges, instead of warn/return 1

#!/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/"
Mercurial