Mercurial > hg > mercurial

annotate mercurial-tests/testData/README @ 452:183656e9294a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge Faradi-7.0.x
author Dmitry Neverov <dmitry.neverov@jetbrains.com>
date Tue, 03 Jul 2012 18:59:14 +0400
parents 63a69ed16c88
children 6b447cd40492
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
276
8c10f5cec37d TW-17797 Fix merge-base calculation
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 274
diff changeset
1 rep1 history:
8c10f5cec37d TW-17797 Fix merge-base calculation
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 274
diff changeset
2 @ 10:9c6a6b4aede0 Multiline description tip
8c10f5cec37d TW-17797 Fix merge-base calculation
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 274
diff changeset
3 |
8c10f5cec37d TW-17797 Fix merge-base calculation
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 274
diff changeset
4 | o 9:9babcf2d5705 name with space branch name with space
8c10f5cec37d TW-17797 Fix merge-base calculation
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 274
diff changeset
5 | |
8c10f5cec37d TW-17797 Fix merge-base calculation
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 274
diff changeset
6 | o 8:04c3ae4c6312 file modified test_branch
8c10f5cec37d TW-17797 Fix merge-base calculation
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 274
diff changeset
7 | |
8c10f5cec37d TW-17797 Fix merge-base calculation
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 274
diff changeset
8 | o 7:376dcf05cd2a new file added in the test_branch test_branch
8c10f5cec37d TW-17797 Fix merge-base calculation
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 274
diff changeset
9 |/
8c10f5cec37d TW-17797 Fix merge-base calculation
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 274
diff changeset
10 o 6:b9deb9a1c6f4 files with spaces added
8c10f5cec37d TW-17797 Fix merge-base calculation
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 274
diff changeset
11 |
8c10f5cec37d TW-17797 Fix merge-base calculation
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 274
diff changeset
12 o 5:1d2cc6f3bc29 modified in subdir
8c10f5cec37d TW-17797 Fix merge-base calculation
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 274
diff changeset
13 |
8c10f5cec37d TW-17797 Fix merge-base calculation
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 274
diff changeset
14 o 4:b06a290a363b file modified
8c10f5cec37d TW-17797 Fix merge-base calculation
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 274
diff changeset
15 |
8c10f5cec37d TW-17797 Fix merge-base calculation
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 274
diff changeset
16 o 3:9522278aa38d file removed
8c10f5cec37d TW-17797 Fix merge-base calculation
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 274
diff changeset
17 |
8c10f5cec37d TW-17797 Fix merge-base calculation
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 274
diff changeset
18 o 2:7209b1f1d793 file4.txt added
8c10f5cec37d TW-17797 Fix merge-base calculation
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 274
diff changeset
19 |
8c10f5cec37d TW-17797 Fix merge-base calculation
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 274
diff changeset
20 o 1:1d446e82d356 new file added
8c10f5cec37d TW-17797 Fix merge-base calculation
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 274
diff changeset
21 |
8c10f5cec37d TW-17797 Fix merge-base calculation
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 274
diff changeset
22 o 0:9875b412a788 dir1 created
8c10f5cec37d TW-17797 Fix merge-base calculation
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 274
diff changeset
23
8c10f5cec37d TW-17797 Fix merge-base calculation
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 274
diff changeset
24
274
5cbb5ae712e9 Add test for TW-17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff changeset
25 rep2 history:
5cbb5ae712e9 Add test for TW-17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff changeset
26
5cbb5ae712e9 Add test for TW-17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff changeset
27 @ 18:df04faa7575a merge personal-branch tip
5cbb5ae712e9 Add test for TW-17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff changeset
28 |\
308
63a69ed16c88 improve docs
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 276
diff changeset
29 | o 17:9ec402c74298 another change to file.txt in personal-branch (personal-branch)
274
5cbb5ae712e9 Add test for TW-17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff changeset
30 | |
5cbb5ae712e9 Add test for TW-17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff changeset
31 o | 16:505c5b9d01e6 change file.txt back
5cbb5ae712e9 Add test for TW-17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff changeset
32 | |
308
63a69ed16c88 improve docs
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 276
diff changeset
33 | o 15:96b78d73081d change file.txt in personal-branch (personal-branch)
274
5cbb5ae712e9 Add test for TW-17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff changeset
34 | |
5cbb5ae712e9 Add test for TW-17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff changeset
35 o | 14:78e67807f916 change file.txt
5cbb5ae712e9 Add test for TW-17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff changeset
36 | |
308
63a69ed16c88 improve docs
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 276
diff changeset
37 | o 13:dec47d2d49bf create personal branch (personal-branch)
274
5cbb5ae712e9 Add test for TW-17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff changeset
38 |/
5cbb5ae712e9 Add test for TW-17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff changeset
39 o 12:1e620196c4b6 merge with test branch
5cbb5ae712e9 Add test for TW-17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff changeset
40 |\
5cbb5ae712e9 Add test for TW-17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff changeset
41 | o 11:48177654181c dir6 trunk
5cbb5ae712e9 Add test for TW-17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff changeset
42 | |
308
63a69ed16c88 improve docs
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 276
diff changeset
43 o | 10:fc524efc2bc4 dir6 (test)
274
5cbb5ae712e9 Add test for TW-17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff changeset
44 | |
308
63a69ed16c88 improve docs
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents: 276
diff changeset
45 o | 9:8c44244d6645 dir5 (test)
274
5cbb5ae712e9 Add test for TW-17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff changeset
46 |/
5cbb5ae712e9 Add test for TW-17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff changeset
47 o 8:b6e2d176fe8e merge with conflict
5cbb5ae712e9 Add test for TW-17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff changeset
48 |\
5cbb5ae712e9 Add test for TW-17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff changeset
49 | o 7:d6eaab231902 branch dir4
5cbb5ae712e9 Add test for TW-17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff changeset
50 | |
5cbb5ae712e9 Add test for TW-17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff changeset
51 o | 6:6066b677d026 file41
5cbb5ae712e9 Add test for TW-17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff changeset
52 | |
5cbb5ae712e9 Add test for TW-17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff changeset
53 o | 5:b4937926e2e3 dir4
5cbb5ae712e9 Add test for TW-17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff changeset
54 |/
5cbb5ae712e9 Add test for TW-17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff changeset
55 o 4:6eeb8974fe67 merge
5cbb5ae712e9 Add test for TW-17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff changeset
56 |\
5cbb5ae712e9 Add test for TW-17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff changeset
57 | o 3:2538c02bafeb dir2
5cbb5ae712e9 Add test for TW-17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff changeset
58 | |
5cbb5ae712e9 Add test for TW-17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff changeset
59 | o 2:db8a04d262f3 dir1
5cbb5ae712e9 Add test for TW-17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff changeset
60 | |
5cbb5ae712e9 Add test for TW-17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff changeset
61 o | 1:a3d15477d297 dir3
5cbb5ae712e9 Add test for TW-17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff changeset
62 |/
5cbb5ae712e9 Add test for TW-17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff changeset
63 o 0:e0ad3ddde5aa file.txt