equal
deleted
inserted
replaced
64 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 {'date': '', 'user': 'test'} |
64 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 {'date': '', 'user': 'test'} |
65 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'} |
65 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'} |
66 $ cd .. |
66 $ cd .. |
67 $ cd .. |
67 $ cd .. |
68 |
68 |
69 Actual Test for first version (changeset unknown remotly) |
69 Actual Test for first version (changeset unknown in remote) |
70 --------------------------------------------------------- |
70 ----------------------------------------------------------- |
71 |
71 |
72 $ dotest A.4 B -f |
72 $ dotest A.4 B -f |
73 ## Running testcase A.4 |
73 ## Running testcase A.4 |
74 # testing echange of "B" (06055a7959d4) |
74 # testing echange of "B" (06055a7959d4) |
75 ## initial state |
75 ## initial state |
85 adding manifests |
85 adding manifests |
86 adding file changes |
86 adding file changes |
87 added 2 changesets with 2 changes to 2 files |
87 added 2 changesets with 2 changes to 2 files |
88 OBSEXC: computing relevant nodes |
88 OBSEXC: computing relevant nodes |
89 OBSEXC: computing markers relevant to 3 nodes |
89 OBSEXC: computing markers relevant to 3 nodes |
90 OBSEXC: pushing 1 markers (62 bytes) |
90 OBSEXC: pushing 1 obsolescence markers (62 bytes) |
91 OBSEXC: DONE |
91 OBSEXC: DONE |
92 ## post push state |
92 ## post push state |
93 # obstore: main |
93 # obstore: main |
94 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'} |
94 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'} |
95 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 {'date': '', 'user': 'test'} |
95 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 {'date': '', 'user': 'test'} |
103 adding manifests |
103 adding manifests |
104 adding file changes |
104 adding file changes |
105 added 2 changesets with 2 changes to 2 files |
105 added 2 changesets with 2 changes to 2 files |
106 OBSEXC: pull obsolescence markers |
106 OBSEXC: pull obsolescence markers |
107 OBSEXC: merging obsolescence markers (62 bytes) |
107 OBSEXC: merging obsolescence markers (62 bytes) |
108 OBSEXC: 1 markers added |
108 OBSEXC: 1 obsolescence markers added |
109 OBSEXC: DONE |
109 OBSEXC: DONE |
110 (run 'hg update' to get a working copy) |
110 (run 'hg update' to get a working copy) |
111 ## post pull state |
111 ## post pull state |
112 # obstore: main |
112 # obstore: main |
113 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'} |
113 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'} |