Mercurial > hg
annotate tests/test-merge4 @ 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 |
416
5e9e8b8d2629
[PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff
changeset
|
2 |
5e9e8b8d2629
[PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff
changeset
|
3 hg init |
5e9e8b8d2629
[PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff
changeset
|
4 echo This is file a1 > a |
5e9e8b8d2629
[PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff
changeset
|
5 hg add a |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
416
diff
changeset
|
6 hg commit -m "commit #0" -d "0 0" |
416
5e9e8b8d2629
[PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff
changeset
|
7 echo This is file b1 > b |
5e9e8b8d2629
[PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff
changeset
|
8 hg add b |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
416
diff
changeset
|
9 hg commit -m "commit #1" -d "0 0" |
416
5e9e8b8d2629
[PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff
changeset
|
10 hg update 0 |
5e9e8b8d2629
[PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff
changeset
|
11 echo This is file c1 > c |
5e9e8b8d2629
[PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff
changeset
|
12 hg add c |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
416
diff
changeset
|
13 hg commit -m "commit #2" -d "0 0" |
416
5e9e8b8d2629
[PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff
changeset
|
14 hg update -m 1 |
5e9e8b8d2629
[PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff
changeset
|
15 rm b |
5e9e8b8d2629
[PATCH] Removal of a file added by merging branches
mpm@selenic.com
parents:
diff
changeset
|
16 echo This is file c22 > c |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
416
diff
changeset
|
17 hg commit -m "commit #3" -d "0 0" |