annotate tests/test-parse-date @ 2548:0229ff95faec

Clarified message when nothing to merge is seen. Sometimes there's a non-tip head waiting to be merged, especially after pulling in remote changes while there were local modifications in the working directory which had to be committed before 'hg merge' can work.
author Thomas Arendsen Hein <thomas@intevation.de>
date Mon, 03 Jul 2006 19:14:29 +0200
parents c1974f65d781
children e96d2956eb4a
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2522
85f796baab10 Allow the use of human readable dates (issue 251)
Jose M. Prieto <jmprieto@gmx.net>
parents:
diff changeset
1 #!/bin/sh
85f796baab10 Allow the use of human readable dates (issue 251)
Jose M. Prieto <jmprieto@gmx.net>
parents:
diff changeset
2
85f796baab10 Allow the use of human readable dates (issue 251)
Jose M. Prieto <jmprieto@gmx.net>
parents:
diff changeset
3 hg init
85f796baab10 Allow the use of human readable dates (issue 251)
Jose M. Prieto <jmprieto@gmx.net>
parents:
diff changeset
4 echo "test-parse-date" > a
85f796baab10 Allow the use of human readable dates (issue 251)
Jose M. Prieto <jmprieto@gmx.net>
parents:
diff changeset
5 hg add a
85f796baab10 Allow the use of human readable dates (issue 251)
Jose M. Prieto <jmprieto@gmx.net>
parents:
diff changeset
6 hg ci -d "2006-02-01 13:00:30" -m "rev 0"
85f796baab10 Allow the use of human readable dates (issue 251)
Jose M. Prieto <jmprieto@gmx.net>
parents:
diff changeset
7 echo "hi!" >> a
85f796baab10 Allow the use of human readable dates (issue 251)
Jose M. Prieto <jmprieto@gmx.net>
parents:
diff changeset
8 hg ci -d "2006-02-01 13:00:30 -0500" -m "rev 1"
85f796baab10 Allow the use of human readable dates (issue 251)
Jose M. Prieto <jmprieto@gmx.net>
parents:
diff changeset
9 hg tag -d "2006-04-15 13:30" "Hi"
85f796baab10 Allow the use of human readable dates (issue 251)
Jose M. Prieto <jmprieto@gmx.net>
parents:
diff changeset
10 hg backout --merge -d "2006-04-15 13:30 +0200" -m "rev 3" 1
85f796baab10 Allow the use of human readable dates (issue 251)
Jose M. Prieto <jmprieto@gmx.net>
parents:
diff changeset
11 hg ci -d "1150000000 14400" -m "rev 4 (merge)"
85f796baab10 Allow the use of human readable dates (issue 251)
Jose M. Prieto <jmprieto@gmx.net>
parents:
diff changeset
12 echo "fail" >> a
85f796baab10 Allow the use of human readable dates (issue 251)
Jose M. Prieto <jmprieto@gmx.net>
parents:
diff changeset
13 hg ci -d "should fail" -m "fail"
2524
c1974f65d781 add more testcases for date parsing
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2522
diff changeset
14 hg ci -d "100000000000000000 1400" -m "fail"
c1974f65d781 add more testcases for date parsing
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2522
diff changeset
15 hg ci -d "100000 1400000" -m "fail"
2522
85f796baab10 Allow the use of human readable dates (issue 251)
Jose M. Prieto <jmprieto@gmx.net>
parents:
diff changeset
16 hg log --template '{date|date}\n'