mirror of
https://github.com/facebook/sapling.git
synced 2024-10-09 16:31:02 +03:00
4f2e35bc33
changegroup() has a problem when nodes which does not descend from a node in <bases> are added to remote after the discovery phase. If that happens, changegroup() won't send the correct set of nodes, ie. some nodes will be missing. To correct it we have to find the set of nodes that both remote and self have (called <common>), and send all the nodes not in <common>. This fix has some overhead, in the worst case it will re-send a whole branch. A proper fix to avoid this overhead might be to change the protocol so that the <common> nodes are sent (instead of the <bases> of the missing nodes).
83 lines
2.2 KiB
Plaintext
83 lines
2.2 KiB
Plaintext
updating working directory
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
pushing to ../a
|
|
searching for changes
|
|
abort: push creates new remote heads!
|
|
(did you forget to merge? use push -f to force)
|
|
pulling from ../a
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files (+1 heads)
|
|
(run 'hg heads' to see heads, 'hg merge' to merge)
|
|
pushing to ../a
|
|
searching for changes
|
|
abort: push creates new remote heads!
|
|
(did you forget to merge? use push -f to force)
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
pushing to ../a
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 2 changesets with 1 changes to 2 files
|
|
adding foo
|
|
updating working directory
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
created new head
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
created new head
|
|
merging foo
|
|
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
pushing to ../c
|
|
searching for changes
|
|
abort: push creates new remote heads!
|
|
(did you forget to merge? use push -f to force)
|
|
1
|
|
pushing to ../c
|
|
searching for changes
|
|
no changes found
|
|
0
|
|
pushing to ../c
|
|
searching for changes
|
|
abort: push creates new remote heads!
|
|
(did you forget to merge? use push -f to force)
|
|
1
|
|
pushing to ../c
|
|
searching for changes
|
|
abort: push creates new remote heads!
|
|
(did you forget to merge? use push -f to force)
|
|
1
|
|
pushing to ../c
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 2 changesets with 2 changes to 1 files (+2 heads)
|
|
0
|
|
pushing to ../c
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files (-1 heads)
|
|
0
|
|
pushing to ../e
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files
|
|
0
|
|
pushing to ../e
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files
|
|
0
|