No subject
Thu Jun 12 23:09:36 BST 2008
Merging HEAD with 4b0f38e8dcbe48c22c7bfd15ded436d42d649965
Merging:
7fdad04 addition
4b0f38e update
found 1 common ancestor(s):
5c5f524 initial
Merge made by recursive.
file3 | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
create mode 100644 file3
* ok 12: pulling changes from origin
* expecting success: cd C &&
echo "2 objects" > expected &&
git count-objects | cut -d, -f1 > current &&
diff expected current
* ok 13: that alternate to origin gets used
* expecting success: cd D &&
git pull origin
remote: Counting objects: 4, done.[K
remote: Compressing objects: 50% (1/2) [K
remote: Compressing objects: 100% (2/2) [K
remote: Compressing objects: 100% (2/2[K)remote: , done.[K
remote: Total 3 (delta 0), reused 3 (delta 0)[K
More information about the ubuntu-autotest
mailing list