Mercurial > hg > mercurial
annotate mercurialtests/testData/bookmarks/README @ 529:33a6be414903
TW17489 support bookmarks
Now they can be used in the branch and branch spec fields
author  Dmitry Neverov <dmitry.neverov@jetbrains.com> 

date  Sat, 29 Dec 2012 18:32:56 +0400 
parents  
children 
rev  line source 

529
33a6be414903
TW17489 support bookmarks
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

1 1) repository with 2 bookmarks (base for tests): 
33a6be414903
TW17489 support bookmarks
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

2 
33a6be414903
TW17489 support bookmarks
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

3 o 5:e052c89b1159 merge 3 [bookmark2] 
33a6be414903
TW17489 support bookmarks
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

4 \ 
33a6be414903
TW17489 support bookmarks
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

5  o 4:e9f8f67888f5 test 1 
33a6be414903
TW17489 support bookmarks
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

6   
33a6be414903
TW17489 support bookmarks
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

7 o  3:15b4a116520d 3 [bookmark1] 
33a6be414903
TW17489 support bookmarks
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

8   
33a6be414903
TW17489 support bookmarks
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

9 o  2:c17933ca5f6e 2 
33a6be414903
TW17489 support bookmarks
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

10 / 
33a6be414903
TW17489 support bookmarks
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

11 o 1:016d505d681f 1 
33a6be414903
TW17489 support bookmarks
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

12  
33a6be414903
TW17489 support bookmarks
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

13 o 0:121c31c787d1 initial 
33a6be414903
TW17489 support bookmarks
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

14 
33a6be414903
TW17489 support bookmarks
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

15 
33a6be414903
TW17489 support bookmarks
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

16 2) bookmark1 udpated: 
33a6be414903
TW17489 support bookmarks
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

17 
33a6be414903
TW17489 support bookmarks
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

18 o 6:7597a4da7195 4 [bookmark1] 
33a6be414903
TW17489 support bookmarks
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

19  
33a6be414903
TW17489 support bookmarks
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

20 o 5:e052c89b1159 merge 3 [bookmark2] 
33a6be414903
TW17489 support bookmarks
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

21 \ 
33a6be414903
TW17489 support bookmarks
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

22  o 4:e9f8f67888f5 test 1 
33a6be414903
TW17489 support bookmarks
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

23   
33a6be414903
TW17489 support bookmarks
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

24 o  3:15b4a116520d 3 
33a6be414903
TW17489 support bookmarks
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

25   
33a6be414903
TW17489 support bookmarks
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

26 o  2:c17933ca5f6e 2 
33a6be414903
TW17489 support bookmarks
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

27 / 
33a6be414903
TW17489 support bookmarks
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

28 o 1:016d505d681f 1 
33a6be414903
TW17489 support bookmarks
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

29  
33a6be414903
TW17489 support bookmarks
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

30 o 0:121c31c787d1 initial 
33a6be414903
TW17489 support bookmarks
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

31 
33a6be414903
TW17489 support bookmarks
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

32 
33a6be414903
TW17489 support bookmarks
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

33 3) all bookmarks removed 
33a6be414903
TW17489 support bookmarks
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

34 
33a6be414903
TW17489 support bookmarks
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

35 
33a6be414903
TW17489 support bookmarks
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

36 4) bookmark1 diverged 
33a6be414903
TW17489 support bookmarks
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

37 
33a6be414903
TW17489 support bookmarks
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

38 o 6:7597a4da7195 4 [bookmark2] 
33a6be414903
TW17489 support bookmarks
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

39  
33a6be414903
TW17489 support bookmarks
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

40 o 5:e052c89b1159 merge 3 
33a6be414903
TW17489 support bookmarks
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

41 \ 
33a6be414903
TW17489 support bookmarks
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

42  o 4:e9f8f67888f5 test 1 [bookmark1] 
33a6be414903
TW17489 support bookmarks
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

43   
33a6be414903
TW17489 support bookmarks
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

44 o  3:15b4a116520d 3 
33a6be414903
TW17489 support bookmarks
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

45   
33a6be414903
TW17489 support bookmarks
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

46 o  2:c17933ca5f6e 2 
33a6be414903
TW17489 support bookmarks
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

47 / 
33a6be414903
TW17489 support bookmarks
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

48 o 1:016d505d681f 1 
33a6be414903
TW17489 support bookmarks
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

49  
33a6be414903
TW17489 support bookmarks
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

50 o 0:121c31c787d1 initial 
33a6be414903
TW17489 support bookmarks
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

51 
33a6be414903
TW17489 support bookmarks
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

52 
33a6be414903
TW17489 support bookmarks
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

53 5) branch with name 'bookmark2' created: 
33a6be414903
TW17489 support bookmarks
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

54 
33a6be414903
TW17489 support bookmarks
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

55 o 7:f63a14e873d6 Create branch bookmark2 (bookmark2) 
33a6be414903
TW17489 support bookmarks
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

56  
33a6be414903
TW17489 support bookmarks
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

57 o 6:7597a4da7195 4 [bookmark2] 
33a6be414903
TW17489 support bookmarks
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

58  
33a6be414903
TW17489 support bookmarks
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

59 o 5:e052c89b1159 merge 3 
33a6be414903
TW17489 support bookmarks
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

60 \ 
33a6be414903
TW17489 support bookmarks
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

61  o 4:e9f8f67888f5 test 1 [bookmark1] 
33a6be414903
TW17489 support bookmarks
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

62   
33a6be414903
TW17489 support bookmarks
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

63 o  3:15b4a116520d 3 
33a6be414903
TW17489 support bookmarks
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

64   
33a6be414903
TW17489 support bookmarks
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

65 o  2:c17933ca5f6e 2 
33a6be414903
TW17489 support bookmarks
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

66 / 
33a6be414903
TW17489 support bookmarks
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

67 o 1:016d505d681f 1 
33a6be414903
TW17489 support bookmarks
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

68  
33a6be414903
TW17489 support bookmarks
Dmitry Neverov <dmitry.neverov@jetbrains.com>
parents:
diff
changeset

69 o 0:121c31c787d1 initial 