equal
deleted
inserted
replaced
65 # obstore: pulldest |
65 # obstore: pulldest |
66 ## pushing from main to pushdest |
66 ## pushing from main to pushdest |
67 pushing to pushdest |
67 pushing to pushdest |
68 searching for changes |
68 searching for changes |
69 no changes found |
69 no changes found |
70 OBSEXC: computing relevant nodes |
70 remote: 2 new obsolescence markers |
71 OBSEXC: computing markers relevant to 1 nodes |
|
72 OBSEXC: pushing 2 obsolescence markers (153 bytes) |
|
73 OBSEXC: DONE |
|
74 ## post push state |
71 ## post push state |
75 # obstore: main |
72 # obstore: main |
76 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
73 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
77 e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
74 e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
78 # obstore: pushdest |
75 # obstore: pushdest |
81 # obstore: pulldest |
78 # obstore: pulldest |
82 ## pulling from main into pulldest |
79 ## pulling from main into pulldest |
83 pulling from main |
80 pulling from main |
84 searching for changes |
81 searching for changes |
85 no changes found |
82 no changes found |
86 OBSEXC: pull obsolescence markers |
83 2 new obsolescence markers |
87 OBSEXC: merging obsolescence markers (153 bytes) |
|
88 OBSEXC: 2 obsolescence markers added |
|
89 OBSEXC: DONE |
|
90 ## post pull state |
84 ## post pull state |
91 # obstore: main |
85 # obstore: main |
92 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
86 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
93 e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
87 e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
94 # obstore: pushdest |
88 # obstore: pushdest |