Mercurial > hg > mercurial
annotate mercurialtests/testData/README @ 564:d012388935fb Faradi7.1.x
TW26379 optimize changes collecting
Take revisions of all branches into account
author  Dmitry Neverov <dmitry.neverov@jetbrains.com> 

date  Wed, 06 Mar 2013 15:49:37 +0400 
parents  6b447cd40492 
children  868916a31d88 
rev  line source 

276
8c10f5cec37d
TW17797 Fix mergebase calculation
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
274
diff
changeset

1 rep1 history: 
8c10f5cec37d
TW17797 Fix mergebase calculation
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
274
diff
changeset

2 @ 10:9c6a6b4aede0 Multiline description tip 
8c10f5cec37d
TW17797 Fix mergebase calculation
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
274
diff
changeset

3  
8c10f5cec37d
TW17797 Fix mergebase calculation
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
274
diff
changeset

4  o 9:9babcf2d5705 name with space branch name with space 
8c10f5cec37d
TW17797 Fix mergebase calculation
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
274
diff
changeset

5   
8c10f5cec37d
TW17797 Fix mergebase calculation
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
274
diff
changeset

6  o 8:04c3ae4c6312 file modified test_branch 
8c10f5cec37d
TW17797 Fix mergebase calculation
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
274
diff
changeset

7   
8c10f5cec37d
TW17797 Fix mergebase 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
TW17797 Fix mergebase calculation
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
274
diff
changeset

9 / 
8c10f5cec37d
TW17797 Fix mergebase calculation
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
274
diff
changeset

10 o 6:b9deb9a1c6f4 files with spaces added 
8c10f5cec37d
TW17797 Fix mergebase calculation
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
274
diff
changeset

11  
8c10f5cec37d
TW17797 Fix mergebase calculation
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
274
diff
changeset

12 o 5:1d2cc6f3bc29 modified in subdir 
8c10f5cec37d
TW17797 Fix mergebase calculation
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
274
diff
changeset

13  
8c10f5cec37d
TW17797 Fix mergebase calculation
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
274
diff
changeset

14 o 4:b06a290a363b file modified 
8c10f5cec37d
TW17797 Fix mergebase calculation
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
274
diff
changeset

15  
8c10f5cec37d
TW17797 Fix mergebase calculation
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
274
diff
changeset

16 o 3:9522278aa38d file removed 
8c10f5cec37d
TW17797 Fix mergebase calculation
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
274
diff
changeset

17  
8c10f5cec37d
TW17797 Fix mergebase calculation
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
274
diff
changeset

18 o 2:7209b1f1d793 file4.txt added 
8c10f5cec37d
TW17797 Fix mergebase calculation
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
274
diff
changeset

19  
8c10f5cec37d
TW17797 Fix mergebase calculation
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
274
diff
changeset

20 o 1:1d446e82d356 new file added 
8c10f5cec37d
TW17797 Fix mergebase calculation
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
274
diff
changeset

21  
8c10f5cec37d
TW17797 Fix mergebase calculation
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
274
diff
changeset

22 o 0:9875b412a788 dir1 created 
8c10f5cec37d
TW17797 Fix mergebase calculation
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
274
diff
changeset

23 
8c10f5cec37d
TW17797 Fix mergebase calculation
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
274
diff
changeset

24 
274
5cbb5ae712e9
Add test for TW17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

25 rep2 history: 
5cbb5ae712e9
Add test for TW17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

26 
564
d012388935fb
TW26379 optimize changes collecting
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
474
diff
changeset

27 o 31:1f355761350e create branch NULL (NULL) tip 
d012388935fb
TW26379 optimize changes collecting
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
474
diff
changeset

28 
d012388935fb
TW26379 optimize changes collecting
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
474
diff
changeset

29 o 30:4780519e01aa continue default tip 
d012388935fb
TW26379 optimize changes collecting
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
474
diff
changeset

30  
d012388935fb
TW26379 optimize changes collecting
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
474
diff
changeset

31  o 29:fd50e4842211 continue topic (topic) 
d012388935fb
TW26379 optimize changes collecting
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
474
diff
changeset

32   
d012388935fb
TW26379 optimize changes collecting
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
474
diff
changeset

33 o  28:737c6f57ef84 merge topic 
d012388935fb
TW26379 optimize changes collecting
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
474
diff
changeset

34 \ 
d012388935fb
TW26379 optimize changes collecting
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
474
diff
changeset

35  o 27:2a368008e4d9 topic2 (topic) 
d012388935fb
TW26379 optimize changes collecting
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
474
diff
changeset

36   
d012388935fb
TW26379 optimize changes collecting
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
474
diff
changeset

37  o 26:27184c50d7ef topic1 (topic) 
d012388935fb
TW26379 optimize changes collecting
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
474
diff
changeset

38   
d012388935fb
TW26379 optimize changes collecting
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
474
diff
changeset

39  o 25:4dbb87c381be start topic (topic) 
d012388935fb
TW26379 optimize changes collecting
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
474
diff
changeset

40   
d012388935fb
TW26379 optimize changes collecting
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
474
diff
changeset

41 o  24:528572bbf77b default3 
d012388935fb
TW26379 optimize changes collecting
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
474
diff
changeset

42   
d012388935fb
TW26379 optimize changes collecting
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
474
diff
changeset

43 o  23:029040d32471 default2 
d012388935fb
TW26379 optimize changes collecting
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
474
diff
changeset

44   
d012388935fb
TW26379 optimize changes collecting
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
474
diff
changeset

45 o  22:32f2afc19d75 default1 
d012388935fb
TW26379 optimize changes collecting
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
474
diff
changeset

46 / 
474
6b447cd40492
TW10076 allow to ignore commits where all files excluded by checkout rules
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
308
diff
changeset

47 o 21:a2672ee13212 Tag for test //add tag t1 on 43023ea3f13b 
6b447cd40492
TW10076 allow to ignore commits where all files excluded by checkout rules
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
308
diff
changeset

48  
6b447cd40492
TW10076 allow to ignore commits where all files excluded by checkout rules
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
308
diff
changeset

49 o 20:43023ea3f13b Merge closed personalbranch 
274
5cbb5ae712e9
Add test for TW17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

50 \ 
474
6b447cd40492
TW10076 allow to ignore commits where all files excluded by checkout rules
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
308
diff
changeset

51  o 19:ca64c523f54c Close personalbranch 
6b447cd40492
TW10076 allow to ignore commits where all files excluded by checkout rules
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
308
diff
changeset

52   
6b447cd40492
TW10076 allow to ignore commits where all files excluded by checkout rules
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
308
diff
changeset

53 @  18:df04faa7575a merge personalbranch tip 
6b447cd40492
TW10076 allow to ignore commits where all files excluded by checkout rules
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
308
diff
changeset

54 \ 
308  55  o 17:9ec402c74298 another change to file.txt in personalbranch (personalbranch) 
274
5cbb5ae712e9
Add test for TW17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

56   
5cbb5ae712e9
Add test for TW17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

57 o  16:505c5b9d01e6 change file.txt back 
5cbb5ae712e9
Add test for TW17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

58   
308  59  o 15:96b78d73081d change file.txt in personalbranch (personalbranch) 
274
5cbb5ae712e9
Add test for TW17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

60   
5cbb5ae712e9
Add test for TW17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

61 o  14:78e67807f916 change file.txt 
5cbb5ae712e9
Add test for TW17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

62   
308  63  o 13:dec47d2d49bf create personal branch (personalbranch) 
274
5cbb5ae712e9
Add test for TW17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

64 / 
5cbb5ae712e9
Add test for TW17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

65 o 12:1e620196c4b6 merge with test branch 
5cbb5ae712e9
Add test for TW17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

66 \ 
5cbb5ae712e9
Add test for TW17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

67  o 11:48177654181c dir6 trunk 
5cbb5ae712e9
Add test for TW17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

68   
308  69 o  10:fc524efc2bc4 dir6 (test) 
274
5cbb5ae712e9
Add test for TW17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

70   
308  71 o  9:8c44244d6645 dir5 (test) 
274
5cbb5ae712e9
Add test for TW17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

72 / 
5cbb5ae712e9
Add test for TW17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

73 o 8:b6e2d176fe8e merge with conflict 
5cbb5ae712e9
Add test for TW17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

74 \ 
5cbb5ae712e9
Add test for TW17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

75  o 7:d6eaab231902 branch dir4 
5cbb5ae712e9
Add test for TW17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

76   
5cbb5ae712e9
Add test for TW17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

77 o  6:6066b677d026 file41 
5cbb5ae712e9
Add test for TW17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

78   
5cbb5ae712e9
Add test for TW17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

79 o  5:b4937926e2e3 dir4 
5cbb5ae712e9
Add test for TW17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

80 / 
5cbb5ae712e9
Add test for TW17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

81 o 4:6eeb8974fe67 merge 
5cbb5ae712e9
Add test for TW17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

82 \ 
5cbb5ae712e9
Add test for TW17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

83  o 3:2538c02bafeb dir2 
5cbb5ae712e9
Add test for TW17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

84   
5cbb5ae712e9
Add test for TW17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

85  o 2:db8a04d262f3 dir1 
5cbb5ae712e9
Add test for TW17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

86   
5cbb5ae712e9
Add test for TW17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

87 o  1:a3d15477d297 dir3 
5cbb5ae712e9
Add test for TW17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

88 / 
5cbb5ae712e9
Add test for TW17797
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

89 o 0:e0ad3ddde5aa file.txt 