Re: Installing changes from branches

[Stefan Monnier <monnier@iro.umontreal.ca>]

>> Actually, IIUC (and last time I checked) this is not quite true, it's
>> just a diff w.r.t the head of the branch from which you merge.
>> I.e. if this "upstream" branch has been updated since you last merged,
>> the diff will include the new changes on the "upstream" branch.  :-(
>> Hopefully someone will tell me I'm wrong,
> I haven't tested it, but that's not what the doc (bzr help
> revisionspec) says:

I don't see anything in the text you quoted that says that
"diff -rsubmit:" will shows the diff w.r.t. the common ancestor.

I just checked again, and sure enough it doesn't use the common ancestor:

   % bzr diff -rsubmit: | md5sum
   Using submit branch file:///home/monnier/src/emacs/bzr/emacs-23/
   e54805e84bf14fa7f4b1a9eab6fdd03a  -
   % bzr diff -r ../emacs-23 | md5sum 
   e54805e84bf14fa7f4b1a9eab6fdd03a  -
   % (cd ../emacs-23/; bzr update)
   [...]
   All changes applied successfully.
   Updated to revision 99717 of branch sftp://bzr.sv.gnu.org/srv/bzr/emacs/emacs-23
   % bzr diff -rsubmit: | md5sum
   Using submit branch file:///home/monnier/src/emacs/bzr/emacs-23/
   6ffa596930696c7bd2514a2aa28be348  -
   %


-- Stefan