Remote Merge

[Erik Bågfors]

>
> Pardon me, but pull is NOT able to merge anything -- that's what makes it
> different from merge.
>

Are you sure? Looks like pull will merge in uncommited changes in the
working directory just fine. (which is what I expect it to do)

: [bagfors at zyrgelkwyt]$ ; bzr branch -r 1300 bzr.dev mybzr

: [bagfors at zyrgelkwyt]$ ; cd mybzr/

: [bagfors at zyrgelkwyt]$ ; echo hej >> bzr

: [bagfors at zyrgelkwyt]$ ; bzr pull
Using saved location: /home/bagfors/usr/src/bzr.dev
0 conflicts encountered.

: [bagfors at zyrgelkwyt]$ ; bzr st
modified:
  bzr

: [bagfors at zyrgelkwyt]$ ; tail -1 bzr
hej

/Erik