Comment 9 for bug 956268

Alex Lewis пишет:
> Ah now I get it!!... (I think)
>
> Ok so...
> parent = trunk
> branch = feature-x
>
> If a file has been added to trunk after feature-x was created the bottom
> panel (whilst viewing feature-x) shows that as a file deleted, because
> feature-x does not have that file. Once trunk is merged into feature-x
> to "synchronise" them feature-x shows only the changes actually made on
> the feature-x branch.
>
> Is that right?

It sounds about to be right. At least from the point of differences
between branches.

I'm sorry Alex, it seems I've misinformed you. In the case of the list
of changes against parent it will use different equivalent CLI

bzr diff -rancestor::trunk..-1

So basically it does diff between branches.

My initial suggestion about

bzr diff -r submit:

will work only if you have already merged some branch to your current
branch.

> If my understanding is now correct that IMO is a little confusing but
> that could be just be my lack of experience and one of the complexities
> of DVCS. If there was a way to display changes you actually made on a
> branch compared to implied changes because of the divergence from the
> parent then that might help avoid the confusion.

--
All the dude wanted was his rug back