Diff from the parent branch

Goffredo Baroncelli kreijack at alice.it
Wed Oct 12 20:22:46 BST 2005


Hi all,

I am working on a bazaar web interface; at the beginning I 'branch'-ed the bzr main tree,
and I edit, & commit my changes on _my_ branch.
Time to time I sync-ed my work with the main branch with the bzr merge command. But now
I don't know how diff my branch ( with the merges of the parent branch ) from the parent branch.

In example

main         devel
branch       branch
  |
  |
  1
  +---->------|
  |           |
  2           2'
  |           |
  +->merge--->|
  |           3'=2+2'


How I can get the diff between 2 and 3' ( == my change from the latest main-branch revision ).
I tried the command 

  bzr diff -r revid:<revsisionid of the latest main-branch-revision>..<revno 3'>

whitout results.
Any suggest ?

Goffredo

-- 
gpg key@ keyserver.linux.it: Goffredo Baroncelli (ghigo) <kreijack inwind DOT it>
Key fingerprint = CE3C 7E01 6782 30A3 5B87  87C0 BB86 505C 6B2A CFF9




More information about the bazaar mailing list