comparison tests/test-sharing.t @ 1608:e359d33856c3 mercurial-3.4

merge with new stable through 3.5 and 3.6
author Pierre-Yves David <pierre-yves.david@fb.com>
date Thu, 11 Feb 2016 00:32:40 +0000
parents 3c7f98753e37
children 05d7df73a56b
comparison
equal deleted inserted replaced
1607:3c7f98753e37 1608:e359d33856c3
257 remote has heads on branch 'default' that are not known locally: cbdfbd5a5db2 257 remote has heads on branch 'default' that are not known locally: cbdfbd5a5db2
258 adding changesets 258 adding changesets
259 adding manifests 259 adding manifests
260 adding file changes 260 adding file changes
261 added 1 changesets with 1 changes to 1 files (+1 heads) 261 added 1 changesets with 1 changes to 1 files (+1 heads)
262 pushing 6 obsolescence markers (55? bytes) (glob) 262 pushing 6 obsolescence markers (5?? bytes) (glob)
263 2 obsolescence markers added 263 2 obsolescence markers added
264 updating bookmark featureX 264 updating bookmark featureX
265 265
266 Bob receives second review, amends, and pushes to public: 266 Bob receives second review, amends, and pushes to public:
267 this time, he's sure he got it right! 267 this time, he's sure he got it right!