Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-merge2 @ 967:1f3710636b45
[PATCH] Print timezone offset when outputting dates
Example:
% hg log | head -12
changeset: 791:41440890e57d2dbacde03a2a114e5114a031ea4a
tag: tip
user: Samuel Tardieu <sam@rfc1149.net>
date: Mon Jul 25 13:24:15 2005 +0200
summary: Parse various date formats when accepting user specified dates
[...]
changeset: 787:ba5c2021364ee876dae170e8f153e43bd0b2bd73
parent: 785:31a80e3723cee0a5991340facb2707e71983eb41
user: Bryan O'Sullivan <bos@serpentine.com>
date: Sun Jul 24 00:39:24 2005 -0800
summary: Get "forget" command to use new walk code.
[...]
author | Samuel Tardieu <sam@rfc1149.net> |
---|---|
date | Fri, 19 Aug 2005 23:23:42 -0800 |
parents | 0902ffece4b4 |
children | 7544700fd931 |
rev | line source |
---|---|
800
ec85f9e6f3b1
Don't use 'set -x', fix exports, sed and hexdump usage for Solaris.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
749
diff
changeset
|
1 #!/bin/sh |
409 | 2 |
3 mkdir t | |
4 cd t | |
5 hg init | |
6 echo This is file a1 > a | |
7 hg add a | |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
409
diff
changeset
|
8 hg commit -m "commit #0" -d "0 0" |
409 | 9 echo This is file b1 > b |
10 hg add b | |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
409
diff
changeset
|
11 hg commit -m "commit #1" -d "0 0" |
409 | 12 rm b |
13 hg update 0 | |
14 echo This is file b2 > b | |
15 hg add b | |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
409
diff
changeset
|
16 hg commit -m "commit #2" -d "0 0" |
409 | 17 cd ..; /bin/rm -rf t |
18 | |
19 mkdir t | |
20 cd t | |
21 hg init | |
22 echo This is file a1 > a | |
23 hg add a | |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
409
diff
changeset
|
24 hg commit -m "commit #0" -d "0 0" |
409 | 25 echo This is file b1 > b |
26 hg add b | |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
409
diff
changeset
|
27 hg commit -m "commit #1" -d "0 0" |
409 | 28 rm b |
29 hg update 0 | |
30 echo This is file b2 > b | |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
409
diff
changeset
|
31 hg commit -A -m "commit #2" -d "0 0" |
409 | 32 cd ..; /bin/rm -rf t |
33 | |
34 mkdir t | |
35 cd t | |
36 hg init | |
37 echo This is file a1 > a | |
38 hg add a | |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
409
diff
changeset
|
39 hg commit -m "commit #0" -d "0 0" |
409 | 40 echo This is file b1 > b |
41 hg add b | |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
409
diff
changeset
|
42 hg commit -m "commit #1" -d "0 0" |
409 | 43 rm b |
44 hg remove b | |
45 hg update 0 | |
46 echo This is file b2 > b | |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
409
diff
changeset
|
47 hg commit -A -m "commit #2" -d "0 0" |
409 | 48 cd ..; /bin/rm -rf t |