How to communicate with upstream sources intelligently

[Wouter van Heyst]

On Thu, Jun 29, 2006 at 02:25:12AM +0300, Jari Aalto+usenet wrote:
> * Wed 2006-06-28 John Arbash Meinel <john AT arbash-meinel.com>
> * Message-Id: 44A30B88.2000604 AT arbash-meinel.com
> >> 
> >>     TRUNK => 1.0 => 1.1
> >> 
> > You could do:
> >
> > cd ~
> > bzr init-repo --trees project
> > cd project
> > bzr init TRUNK-1.0
> > cd TRUNK-1.0
> > (untar the tarball)
> > bzr add; bzr commit -m "release 1.0"
> >
> > cd ..
> > bzr branch TRUNK-1.0 TRUNK-1.1
> > etc.
> 
> Ok, I see. Now they are complete separate. I was thinking "svn
> switch", but bzr does not yet have it if I rememeber correct.
> 
> Hm. How do I diff between 1.0 and 1.1 to see what's changed
> in the model you presented?

After branching TRUNK-1.0 to TRUNK-1.1, deleting all files, untarring,
bzr add and bzr commit, just diff the two.

cd ..
bzr diff TRUNK-1.0 TRUNK-1.1

Or use the 'branch' revision spec:

cd TRUNK-1.1
bzr diff -r branch:../TRUNK-1.0

In the case where you just imported 1.1, you could ofcourse also
check the difference with the previous revision.

cd TRUNK-1.1
bzr diff -r -2..-1

hth,
Wouter van Heyst