Mercurial > hg
annotate tests/test-diffdir @ 2019:ced2d3620f95
add merge command. means same thing as "update -m".
repo.addchangegroup method now returns number of heads modified and added,
so command line can tell whether update or merge needed. this makes
tiny change to ssh wire protocol, but change is backwards compatible.
pull command now returns 0 if no changes to pull.
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Wed, 29 Mar 2006 10:27:16 -0800 |
parents | 7544700fd931 |
children | 096f1c73cdc3 |
rev | line source |
---|---|
536 | 1 #!/bin/sh |
2 | |
3 hg init | |
4 touch a | |
5 hg add a | |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1723
diff
changeset
|
6 hg ci -m "a" -d "1000000 0" |
536 | 7 |
8 echo 123 > b | |
9 hg add b | |
949 | 10 hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ |
11 -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" | |
536 | 12 |
949 | 13 hg diff -r tip | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ |
14 -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" | |
1723
fde8fb2cbede
Fix diff against an empty file (issue124) and add a test for this.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
981
diff
changeset
|
15 |
fde8fb2cbede
Fix diff against an empty file (issue124) and add a test for this.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
981
diff
changeset
|
16 echo foo > a |
fde8fb2cbede
Fix diff against an empty file (issue124) and add a test for this.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
981
diff
changeset
|
17 hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ |
fde8fb2cbede
Fix diff against an empty file (issue124) and add a test for this.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
981
diff
changeset
|
18 -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" |