Mercurial > hg > gitweb

annotate tests/test-rawcommit1.out @ 993:6f274afc05c7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Clean up some merge logic - rename mode to branch_merge - use explicit update mode - use negative mtime for updates that set mtime - expand some cryptic variable names - elaborate merge dirstate comments - remove redundant manifest lookup for non-merge case - remove impossible merge case - fix up test cases
author mpm@selenic.com
date Tue, 23 Aug 2005 02:19:38 -0700
parents 4f81068ed8cd
children dbb8bba48510
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
1 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
2 54837d97f2932a8194e69745a280a2c11e61ff9c 644 b
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
3 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
4 54837d97f2932a8194e69745a280a2c11e61ff9c 644 b
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
5 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
784
853bfbf1a312 Fix tests for short changeset hashes and hidden manifest hashes
mpm@selenic.com
parents: 749
diff changeset
6 changeset: 2:9f827976dae4
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
7 tag: tip
749
7e4843b7efd2 Update tests to use commit -m and default -u
mpm@selenic.com
parents: 591
diff changeset
8 user: test
967
1f3710636b45 [PATCH] Print timezone offset when outputting dates
Samuel Tardieu <sam@rfc1149.net>
parents: 925
diff changeset
9 date: Thu Jan 1 00:00:00 1970 +0000
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 547
diff changeset
10 summary: 2
546
c8ae964109c1 Add an empty line after description in verbose mode of show_changeset.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 495
diff changeset
11
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
12 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
13 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
993
6f274afc05c7 Clean up some merge logic
mpm@selenic.com
parents: 981
diff changeset
14 changeset: 3:142428fbbcc5
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
15 tag: tip
749
7e4843b7efd2 Update tests to use commit -m and default -u
mpm@selenic.com
parents: 591
diff changeset
16 user: test
967
1f3710636b45 [PATCH] Print timezone offset when outputting dates
Samuel Tardieu <sam@rfc1149.net>
parents: 925
diff changeset
17 date: Thu Jan 1 00:00:00 1970 +0000
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 547
diff changeset
18 summary: 3
546
c8ae964109c1 Add an empty line after description in verbose mode of show_changeset.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 495
diff changeset
19
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
20 d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
21 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
993
6f274afc05c7 Clean up some merge logic
mpm@selenic.com
parents: 981
diff changeset
22 changeset: 4:4d450f9aa680
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
23 tag: tip
749
7e4843b7efd2 Update tests to use commit -m and default -u
mpm@selenic.com
parents: 591
diff changeset
24 user: test
967
1f3710636b45 [PATCH] Print timezone offset when outputting dates
Samuel Tardieu <sam@rfc1149.net>
parents: 925
diff changeset
25 date: Thu Jan 1 00:00:00 1970 +0000
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 547
diff changeset
26 summary: 4
546
c8ae964109c1 Add an empty line after description in verbose mode of show_changeset.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 495
diff changeset
27
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
28 05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
29 54837d97f2932a8194e69745a280a2c11e61ff9c 644 b
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
30 3570202ceac2b52517df64ebd0a062cb0d8fe33a 644 c
993
6f274afc05c7 Clean up some merge logic
mpm@selenic.com
parents: 981
diff changeset
31 changeset: 4:4d450f9aa680
749
7e4843b7efd2 Update tests to use commit -m and default -u
mpm@selenic.com
parents: 591
diff changeset
32 user: test
967
1f3710636b45 [PATCH] Print timezone offset when outputting dates
Samuel Tardieu <sam@rfc1149.net>
parents: 925
diff changeset
33 date: Thu Jan 1 00:00:00 1970 +0000
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 547
diff changeset
34 summary: 4
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
35
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
36 d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
37 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
993
6f274afc05c7 Clean up some merge logic
mpm@selenic.com
parents: 981
diff changeset
38 changeset: 6:b4b8b9afa8cc
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
39 tag: tip
993
6f274afc05c7 Clean up some merge logic
mpm@selenic.com
parents: 981
diff changeset
40 parent: 4:4d450f9aa680
784
853bfbf1a312 Fix tests for short changeset hashes and hidden manifest hashes
mpm@selenic.com
parents: 749
diff changeset
41 parent: 5:a7925a42d0df
749
7e4843b7efd2 Update tests to use commit -m and default -u
mpm@selenic.com
parents: 591
diff changeset
42 user: test
967
1f3710636b45 [PATCH] Print timezone offset when outputting dates
Samuel Tardieu <sam@rfc1149.net>
parents: 925
diff changeset
43 date: Thu Jan 1 00:00:00 1970 +0000
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 547
diff changeset
44 summary: 6
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
45
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
46 d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
47 76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
993
6f274afc05c7 Clean up some merge logic
mpm@selenic.com
parents: 981
diff changeset
48 changeset: 7:f84d0b1b024e
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
49 tag: tip
749
7e4843b7efd2 Update tests to use commit -m and default -u
mpm@selenic.com
parents: 591
diff changeset
50 user: test
967
1f3710636b45 [PATCH] Print timezone offset when outputting dates
Samuel Tardieu <sam@rfc1149.net>
parents: 925
diff changeset
51 date: Thu Jan 1 00:00:00 1970 +0000
591
eb46971fc57f options: kill -d for debug
mpm@selenic.com
parents: 547
diff changeset
52 summary: 7
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
53