Mercurial > hg
view tests/test-diffdir @ 3071:547d1a4aa105
hg merge: fix lookup of branch
add some tests for branch usage
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Fri, 08 Sep 2006 02:16:16 +0200 |
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/"