Hi folks,
I was reviewing one merge proposal for Inkscape, but something that would really help is something similar to git's merge-base, which gives me the common ancestor of two branches. This way, I could see the diff introduced by the new branch without being spammed/flooded by new commits that aren't interesting for my review.
So, any Bazzar experts wishing to give me a helping hand here?
On Wed, 2014-03-05 at 19:58 -0300, Vinícius dos Santos Oliveira wrote:
I was reviewing one merge proposal for Inkscape, but something that would really help is something similar to git's merge-base, which gives me the common ancestor of two branches. This way, I could see the diff introduced by the new branch without being spammed/flooded by new commits that aren't interesting for my review.
So, any Bazzar experts wishing to give me a helping hand here?
bzr diff -r ancestor:lp:inkscape
Where the "lp:inkscape" is the branch identifier, it could be "../trunk" as well. I also like a "--using meld" in there :-)
Ted
Em Qua, 2014-03-05 às 17:32 -0600, Ted Gould escreveu:
bzr diff -r ancestor:lp:inkscape
It works here.
Where the "lp:inkscape" is the branch identifier, it could be "../trunk" as well.
Can you give me a full command-line example of local branch identifiers (or even asciinema link if you go on mad mode)? Here in my computer only lp:inkscape works.
bzr diff -r ancestor:/home/vinipsmaker/Projetos/inkscape/.git/bzr/repo
fails with exit status 3 and the message:
ERROR: Not a branch: "/home/vinipsmaker/Projetos/inkscape/.git/bzr/repo".
The folder that I need to point is the folder containing the .bzr folder or the .bzr folder itself? I tried both and both failed.
I also like a "--using meld" in there :-)
meld is the tool that I like to use to see diffs too, but file-by-file view is just awkward. I'd like to have a high-level overview of the files affected and ignore the ones that won't be trouble (like gettext translation files). But don't worry about this, because I'll use something of my own anyway. Just commenting.
Thanks for the help.
On Wed, 2014-03-05 at 22:09 -0300, Vinícius dos Santos Oliveira wrote:
Em Qua, 2014-03-05 às 17:32 -0600, Ted Gould escreveu:
Where the "lp:inkscape" is the branch identifier, it could be "../trunk" as well.
Can you give me a full command-line example of local branch identifiers (or even asciinema link if you go on mad mode)? Here in my computer only lp:inkscape works.
bzr diff -r ancestor:/home/vinipsmaker/Projetos/inkscape/.git/bzr/repo
fails with exit status 3 and the message:
ERROR: Not a branch: "/home/vinipsmaker/Projetos/inkscape/.git/bzr/repo".
The folder that I need to point is the folder containing the .bzr folder or the .bzr folder itself? I tried both and both failed.
Your paths are a little confusing, not sure how the .git got in there, so let me comment using my layout as an example. I put all my software in ~/Development with a directory for the project "inkscape" and then the branches. So I could have two branches like this:
/home/ted/Development/inkscape/trunk /home/ted/Development/inkscape/foo
I'd create each of those by doing something like:
cd /home/ted/Development/inkscape bzr branch lp:inkscape trunk
I could get a diff of foo using the common ancestor of foo and trunk by doing:
cd /home/ted/Development/inkscape/foo bzr diff -r ancestor:../trunk
Does that answer your questions? If not, perhaps bzr help revisionspec could shed some light for you.
Ted
Em Qua, 2014-03-05 às 22:00 -0600, Ted Gould escreveu:
[...] Does that answer your questions? If not, perhaps bzr help revisionspec could shed some light for you.
Yes, it does answer my questions.
Maybe I'll have more questions in the future, but for now I'm satisfied. Thanks.
participants (2)
-
Ted Gould -
Vinícius dos Santos Oliveira