##// END OF EJS Templates
merge.
merge.

File last commit:

r2935:1c66aad2 default
r2952:6ba3409f merge default
Show More
test-git-export
52 lines | 1.1 KiB | text/plain | TextLexer
Brendan Cully
Add diff --git option
r2907 #!/bin/sh
hg init a
cd a
echo start > start
hg ci -Amstart -d '0 0'
echo new > new
hg ci -Amnew -d '0 0'
echo '% new file'
Brendan Cully
sed portability fixes
r2935 hg diff --git -r 0 | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
-e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/"
Brendan Cully
Add diff --git option
r2907
hg cp new copy
hg ci -mcopy -d '0 0'
echo '% copy'
Brendan Cully
sed portability fixes
r2935 hg diff --git -r 1:tip | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
-e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/"
Brendan Cully
Add diff --git option
r2907
hg mv copy rename
hg ci -mrename -d '0 0'
echo '% rename'
Brendan Cully
sed portability fixes
r2935 hg diff --git -r 2:tip | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
-e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/"
Brendan Cully
Add diff --git option
r2907
hg rm rename
hg ci -mdelete -d '0 0'
echo '% delete'
Brendan Cully
sed portability fixes
r2935 hg diff --git -r 3:tip | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
-e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/"
Brendan Cully
Add diff --git option
r2907
cat > src <<EOF
1
2
3
4
5
EOF
hg ci -Amsrc -d '0 0'
chmod +x src
hg ci -munexec -d '0 0'
echo '% chmod 644'
Brendan Cully
sed portability fixes
r2935 hg diff --git -r 5:tip | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
-e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/"
Brendan Cully
Add diff --git option
r2907
hg mv src dst
chmod -x dst
echo a >> dst
hg ci -mrenamemod -d '0 0'
echo '% rename+mod+chmod'
Brendan Cully
sed portability fixes
r2935 hg diff --git -r 6:tip | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
-e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/"