diff tests/test-push-warn.out @ 7233:9f0e52e1df77

fix pull racing with push/commit (issue1320)

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).

--- a/tests/test-push-warn.out	Thu Oct 23 23:03:09 2008 +0200
+++ b/tests/test-push-warn.out	Tue Oct 21 17:00:35 2008 +0200
@@ -22,7 +22,7 @@
 adding changesets
 adding manifests
 adding file changes
-added 2 changesets with 1 changes to 1 files
+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