Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-parse-date @ 5483:0c43f87baba3 default tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix file-changed-to-dir and dir-to-file commits (issue660). Allow adding to dirstate files that clash with previously existing but marked for removal. Protect from reintroducing clashes by revert. This change doesn't address related issues with update. Current workaround is to do "clean" update by manually removing conflicting files/dirs from working directory.
author Maxim Dounin <mdounin@mdounin.ru>
date Sat, 27 Oct 2007 16:27:55 +0400
parents e5c9a084ffe3
children
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
3250
e96d2956eb4a util.strdate: compute timestamp using UTC, not local timezone
Jose M. Prieto <jmprieto@gmx.net>
parents: 2524
diff changeset
3 # This runs with TZ="GMT"
2522
85f796baab10 Allow the use of human readable dates (issue 251)
Jose M. Prieto <jmprieto@gmx.net>
parents:
diff changeset
4 hg init
85f796baab10 Allow the use of human readable dates (issue 251)
Jose M. Prieto <jmprieto@gmx.net>
parents:
diff changeset
5 echo "test-parse-date" > a
85f796baab10 Allow the use of human readable dates (issue 251)
Jose M. Prieto <jmprieto@gmx.net>
parents:
diff changeset
6 hg add a
85f796baab10 Allow the use of human readable dates (issue 251)
Jose M. Prieto <jmprieto@gmx.net>
parents:
diff changeset
7 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
8 echo "hi!" >> a
85f796baab10 Allow the use of human readable dates (issue 251)
Jose M. Prieto <jmprieto@gmx.net>
parents:
diff changeset
9 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
10 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
11 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
12 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
13 echo "fail" >> a
85f796baab10 Allow the use of human readable dates (issue 251)
Jose M. Prieto <jmprieto@gmx.net>
parents:
diff changeset
14 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
15 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
16 hg ci -d "100000 1400000" -m "fail"
3250
e96d2956eb4a util.strdate: compute timestamp using UTC, not local timezone
Jose M. Prieto <jmprieto@gmx.net>
parents: 2524
diff changeset
17
e96d2956eb4a util.strdate: compute timestamp using UTC, not local timezone
Jose M. Prieto <jmprieto@gmx.net>
parents: 2524
diff changeset
18 # Check with local timezone other than GMT and with DST
e96d2956eb4a util.strdate: compute timestamp using UTC, not local timezone
Jose M. Prieto <jmprieto@gmx.net>
parents: 2524
diff changeset
19 TZ="PST+8PDT"
e96d2956eb4a util.strdate: compute timestamp using UTC, not local timezone
Jose M. Prieto <jmprieto@gmx.net>
parents: 2524
diff changeset
20 export TZ
e96d2956eb4a util.strdate: compute timestamp using UTC, not local timezone
Jose M. Prieto <jmprieto@gmx.net>
parents: 2524
diff changeset
21 # PST=UTC-8 / PDT=UTC-7
e96d2956eb4a util.strdate: compute timestamp using UTC, not local timezone
Jose M. Prieto <jmprieto@gmx.net>
parents: 2524
diff changeset
22 hg debugrebuildstate
e96d2956eb4a util.strdate: compute timestamp using UTC, not local timezone
Jose M. Prieto <jmprieto@gmx.net>
parents: 2524
diff changeset
23 echo "a" > a
3251
e5c9a084ffe3 util.strdate: assume local time when no timezone specified
Jose M. Prieto <jmprieto@gmx.net>
parents: 3250
diff changeset
24 hg ci -d "2006-07-15 13:30" -m "summer@UTC-7"
3250
e96d2956eb4a util.strdate: compute timestamp using UTC, not local timezone
Jose M. Prieto <jmprieto@gmx.net>
parents: 2524
diff changeset
25 hg debugrebuildstate
e96d2956eb4a util.strdate: compute timestamp using UTC, not local timezone
Jose M. Prieto <jmprieto@gmx.net>
parents: 2524
diff changeset
26 echo "b" > a
e96d2956eb4a util.strdate: compute timestamp using UTC, not local timezone
Jose M. Prieto <jmprieto@gmx.net>
parents: 2524
diff changeset
27 hg ci -d "2006-07-15 13:30 +0500" -m "summer@UTC+5"
e96d2956eb4a util.strdate: compute timestamp using UTC, not local timezone
Jose M. Prieto <jmprieto@gmx.net>
parents: 2524
diff changeset
28 hg debugrebuildstate
e96d2956eb4a util.strdate: compute timestamp using UTC, not local timezone
Jose M. Prieto <jmprieto@gmx.net>
parents: 2524
diff changeset
29 echo "c" > a
3251
e5c9a084ffe3 util.strdate: assume local time when no timezone specified
Jose M. Prieto <jmprieto@gmx.net>
parents: 3250
diff changeset
30 hg ci -d "2006-01-15 13:30" -m "winter@UTC-8"
3250
e96d2956eb4a util.strdate: compute timestamp using UTC, not local timezone
Jose M. Prieto <jmprieto@gmx.net>
parents: 2524
diff changeset
31 hg debugrebuildstate
e96d2956eb4a util.strdate: compute timestamp using UTC, not local timezone
Jose M. Prieto <jmprieto@gmx.net>
parents: 2524
diff changeset
32 echo "d" > a
e96d2956eb4a util.strdate: compute timestamp using UTC, not local timezone
Jose M. Prieto <jmprieto@gmx.net>
parents: 2524
diff changeset
33 hg ci -d "2006-01-15 13:30 +0500" -m "winter@UTC+5"
2522
85f796baab10 Allow the use of human readable dates (issue 251)
Jose M. Prieto <jmprieto@gmx.net>
parents:
diff changeset
34 hg log --template '{date|date}\n'