Mercurial > hg > mercurial
annotate mercurial-tests/testData/README @ 932:448ef0521954 Hajipur-9.1.x
TW-42308 delete file only if it exists to avoid warns in log
author | Dmitry Neverov <dmitry.neverov@gmail.com> |
---|---|
date | Wed, 16 Sep 2015 19:55:47 +0200 |
parents | 868916a31d88 |
children |
rev | line source |
---|---|
276
8c10f5cec37d
TW-17797 Fix merge-base calculation
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
274
diff
changeset
|
1 rep1 history: |
588
868916a31d88
Fix incremental patch for commits with removes only
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
557
diff
changeset
|
2 o 11:e6935c9c80bf create branch and remove file.txt (test_remove) |
868916a31d88
Fix incremental patch for commits with removes only
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
557
diff
changeset
|
3 | |
868916a31d88
Fix incremental patch for commits with removes only
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
557
diff
changeset
|
4 o 10:9c6a6b4aede0 Multiline description |
276
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 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
|
7 | | |
8c10f5cec37d
TW-17797 Fix merge-base calculation
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
274
diff
changeset
|
8 | o 8:04c3ae4c6312 file modified 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 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
|
11 |/ |
8c10f5cec37d
TW-17797 Fix merge-base calculation
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
274
diff
changeset
|
12 o 6:b9deb9a1c6f4 files with spaces added |
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 5:1d2cc6f3bc29 modified in subdir |
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 4:b06a290a363b file modified |
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 3:9522278aa38d file removed |
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 2:7209b1f1d793 file4.txt 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 1:1d446e82d356 new file added |
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 o 0:9875b412a788 dir1 created |
8c10f5cec37d
TW-17797 Fix merge-base calculation
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
274
diff
changeset
|
25 |
8c10f5cec37d
TW-17797 Fix merge-base calculation
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
274
diff
changeset
|
26 |
274
5cbb5ae712e9
Add test for TW-17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset
|
27 rep2 history: |
5cbb5ae712e9
Add test for TW-17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset
|
28 |
588
868916a31d88
Fix incremental patch for commits with removes only
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
557
diff
changeset
|
29 o 31:1f355761350e create branch NULL (NULL) |
557
2b8299ba321d
Speed up changes collecting
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
474
diff
changeset
|
30 |
588
868916a31d88
Fix incremental patch for commits with removes only
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
557
diff
changeset
|
31 o 30:4780519e01aa continue default |
557
2b8299ba321d
Speed up changes collecting
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
474
diff
changeset
|
32 | |
2b8299ba321d
Speed up changes collecting
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
474
diff
changeset
|
33 | o 29:fd50e4842211 continue topic (topic) |
2b8299ba321d
Speed up changes collecting
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
474
diff
changeset
|
34 | | |
2b8299ba321d
Speed up changes collecting
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
474
diff
changeset
|
35 o | 28:737c6f57ef84 merge topic |
2b8299ba321d
Speed up changes collecting
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
474
diff
changeset
|
36 |\| |
2b8299ba321d
Speed up changes collecting
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
474
diff
changeset
|
37 | o 27:2a368008e4d9 topic2 (topic) |
2b8299ba321d
Speed up changes collecting
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
474
diff
changeset
|
38 | | |
2b8299ba321d
Speed up changes collecting
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
474
diff
changeset
|
39 | o 26:27184c50d7ef topic1 (topic) |
2b8299ba321d
Speed up changes collecting
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
474
diff
changeset
|
40 | | |
2b8299ba321d
Speed up changes collecting
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
474
diff
changeset
|
41 | o 25:4dbb87c381be start topic (topic) |
2b8299ba321d
Speed up changes collecting
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
474
diff
changeset
|
42 | | |
2b8299ba321d
Speed up changes collecting
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
474
diff
changeset
|
43 o | 24:528572bbf77b default3 |
2b8299ba321d
Speed up changes collecting
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
474
diff
changeset
|
44 | | |
2b8299ba321d
Speed up changes collecting
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
474
diff
changeset
|
45 o | 23:029040d32471 default2 |
2b8299ba321d
Speed up changes collecting
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
474
diff
changeset
|
46 | | |
2b8299ba321d
Speed up changes collecting
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
474
diff
changeset
|
47 o | 22:32f2afc19d75 default1 |
2b8299ba321d
Speed up changes collecting
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
474
diff
changeset
|
48 |/ |
474
6b447cd40492
TW-10076 allow to ignore commits where all files excluded by checkout rules
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
308
diff
changeset
|
49 o 21:a2672ee13212 Tag for test //add tag t1 on 43023ea3f13b |
6b447cd40492
TW-10076 allow to ignore commits where all files excluded by checkout rules
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
308
diff
changeset
|
50 | |
6b447cd40492
TW-10076 allow to ignore commits where all files excluded by checkout rules
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
308
diff
changeset
|
51 o 20:43023ea3f13b Merge closed personal-branch |
274
5cbb5ae712e9
Add test for TW-17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset
|
52 |\ |
474
6b447cd40492
TW-10076 allow to ignore commits where all files excluded by checkout rules
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
308
diff
changeset
|
53 | o 19:ca64c523f54c Close personal-branch |
6b447cd40492
TW-10076 allow to ignore commits where all files excluded by checkout rules
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
308
diff
changeset
|
54 | | |
588
868916a31d88
Fix incremental patch for commits with removes only
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
557
diff
changeset
|
55 o | 18:df04faa7575a merge personal-branch |
474
6b447cd40492
TW-10076 allow to ignore commits where all files excluded by checkout rules
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
308
diff
changeset
|
56 |\| |
308 | 57 | 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
|
58 | | |
5cbb5ae712e9
Add test for TW-17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset
|
59 o | 16:505c5b9d01e6 change file.txt back |
5cbb5ae712e9
Add test for TW-17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset
|
60 | | |
308 | 61 | 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
|
62 | | |
5cbb5ae712e9
Add test for TW-17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset
|
63 o | 14:78e67807f916 change file.txt |
5cbb5ae712e9
Add test for TW-17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset
|
64 | | |
308 | 65 | o 13:dec47d2d49bf create personal branch (personal-branch) |
274
5cbb5ae712e9
Add test for TW-17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset
|
66 |/ |
5cbb5ae712e9
Add test for TW-17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset
|
67 o 12:1e620196c4b6 merge with test branch |
5cbb5ae712e9
Add test for TW-17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset
|
68 |\ |
5cbb5ae712e9
Add test for TW-17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset
|
69 | o 11:48177654181c dir6 trunk |
5cbb5ae712e9
Add test for TW-17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset
|
70 | | |
308 | 71 o | 10:fc524efc2bc4 dir6 (test) |
274
5cbb5ae712e9
Add test for TW-17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset
|
72 | | |
308 | 73 o | 9:8c44244d6645 dir5 (test) |
274
5cbb5ae712e9
Add test for TW-17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset
|
74 |/ |
5cbb5ae712e9
Add test for TW-17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset
|
75 o 8:b6e2d176fe8e merge with conflict |
5cbb5ae712e9
Add test for TW-17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset
|
76 |\ |
5cbb5ae712e9
Add test for TW-17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset
|
77 | o 7:d6eaab231902 branch dir4 |
5cbb5ae712e9
Add test for TW-17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset
|
78 | | |
5cbb5ae712e9
Add test for TW-17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset
|
79 o | 6:6066b677d026 file41 |
5cbb5ae712e9
Add test for TW-17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset
|
80 | | |
5cbb5ae712e9
Add test for TW-17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset
|
81 o | 5:b4937926e2e3 dir4 |
5cbb5ae712e9
Add test for TW-17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset
|
82 |/ |
5cbb5ae712e9
Add test for TW-17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset
|
83 o 4:6eeb8974fe67 merge |
5cbb5ae712e9
Add test for TW-17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset
|
84 |\ |
5cbb5ae712e9
Add test for TW-17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset
|
85 | o 3:2538c02bafeb dir2 |
5cbb5ae712e9
Add test for TW-17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset
|
86 | | |
5cbb5ae712e9
Add test for TW-17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset
|
87 | o 2:db8a04d262f3 dir1 |
5cbb5ae712e9
Add test for TW-17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset
|
88 | | |
5cbb5ae712e9
Add test for TW-17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset
|
89 o | 1:a3d15477d297 dir3 |
5cbb5ae712e9
Add test for TW-17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset
|
90 |/ |
5cbb5ae712e9
Add test for TW-17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset
|
91 o 0:e0ad3ddde5aa file.txt |