How to communicate with upstream sources intelligently
John Arbash Meinel
john at arbash-meinel.com
Thu Jun 29 03:04:19 BST 2006
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Jari Aalto+usenet wrote:
> * Thu 2006-06-29 Wouter van Heyst <larstiq AT larstiq.dyndns.org>
> * Message-Id: 20060628233222.GJ32184 AT larstiq.dyndns.org
>>> 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
>
> *leaning forward* That's new. Are the prefix modifiers like "branch:"
> explained somewhere?
>
>> 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
>
> Where can I learn more about the negative revisions? This doesn't seem
> to be mentioned in "bzr diff -h" (v0.8.2).
>
> Thanks,
> Jari
>
This should also work
bzr diff TRUNK-1.0 TRUNK-1.1
This was added fairly recently (I think it is post 0.8.2, but I'm not
positive).
Actually, if there are two branches, and there is a lot of development
on both, another good revision specifier is:
bzr diff -r ancestor:../Other
That finds the common ancestor of this branch and other branch, and
gives you the diff. I use it a lot for seeing what would happen if I
merged two branches.
John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.1 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQFEozUjJdeBCYSNAAMRAuYHAJ97Gmt3qfYiG4UTx7pxMoouAdFyZgCgl2Fz
NjeHp1Woj7/sI5KMnrnxUwI=
=VtCj
-----END PGP SIGNATURE-----
More information about the bazaar
mailing list