upstream, branching, diverging, merging oh my!

[Jari Aalto]

John Arbash Meinel <john at arbash-meinel.com> writes:

> Bob Tanner wrote:
> ...
>
>> Of course openvpn progress didn't stop, upstream kept changing, but I
>> ignored it in bliss, until today, when I realized I should be pulling
>> upstream changes into my "branch". So:
>> 
>> cd /usr/src/openvpn
>> bzr init
>> bzr add
>> bzr commit 
>
> If you had changed it to:
>
> bzr init
> bzr add --file-ids-from ../mybranch
> bzr commit

Kindly add documentation or use cases for the --file-ids-from to the
manual page (or extended --help). Looking at "bzr add --help":

  options:
    --file-ids-from=ARG  Lookup file ids from here

"*Pheh*, it does what?"

Jari