bzr push / bzr merge

[Parth Malwankar]

Hello,

I use bzr+ssh to talk to my server which holds the repo.
I have a local branch which I keep in sync using bzr pull or merge
as needed. In case the server copy has diverged due to checkin
by someone else, push fails and then I do a merge.

I recently upgraded to bzr 1.13 and observed that if I do a "bzr
push" on a branch that has diverged, bzr transfers about 2MB
of data before failing saying that I need to do a merge. It says
"walking tree 1/1" during this time.

"bzr pull" itself is very quick and transfers about 50kB or so
based on the changeset size I think.

I was wondering if bzr pull transferring so much data before
failing is expected behaviour. Considering
that the branches have diverged and that bzr is just going
to tell me to merge instead of pull, I was confused as to why
so much data is transferred.

In case the branches have not diverges, pull is very quick,
50kB or so.

I am using 1.9-rich-root on the server as well as client.
In case it matters, we migrated from svn a while back after
importing my repo and now use bzr exclusively for this
project.

Thanks.
Parth