diff between two arbitrary revisions
Matthieu Moy
Matthieu.Moy at imag.fr
Mon Nov 28 20:13:32 GMT 2005
Hi,
I'm just waking up a new thread:
http://article.gmane.org/gmane.comp.version-control.bazaar-ng.general/4627
The problem was that bzr's command-line didn't allow calling "bzr
diff" between two arbitrary remote revisons. Several solutions were
proposed, but AFAIK, no decisions were taken.
1) changing the namespace to allow, for example
bzr diff -r revno:42:http://path.to/branch..revno:24:http://path.to/other
2) use a fragment in the url
bzr diff -r branch:http://path.to/branch;revno=42.. ...
3) change the UI, but not the namespace
bzr diff --branch http://path.to/branch -r 42 \
--branch http://path.to/other -r 24
In the meantime, "bzr diff" was modified to accept two branches as
input, so
bzr diff path/to/file1 path/to/file2
is a limited diff, but
bzr diff path/to/branch1 path/to/branch2
is an inter-tree diff. Also, one can diff two revisions of the same
branch with
bzr diff -r 24..42 /path/to/branch/
This goes in the direction of 3) above, but isn't sufficient, because
it doesn't allow you to specify a revno for the branches. Moreover, it
accepts only local branches.
So, what are the plans, finally ?
--
Matthieu
More information about the bazaar
mailing list