> So, If I try to merge, it still needs to get the complete list of files.
> Ok. But 'bzr help view' (a quite long doc, btw :P) says:
>
> """
> To disable the current view without deleting it, you can switch to
> the pseudo view called ``off``. This can be useful when you need
> to see the whole tree for an operation or two (e.g. merge) but
> want to switch back to your view after that.
> """
>
> I guess that its because we will want to check 'bzr st' and etc before
> committing the merge (and so will need the whole list of affected
> files), or simply because the committing the merge will fail If we
> aren't viewing the whole tree?
The commit of the merge has to commit all the changes because Bazaar
doesn't support committing only some files if there's a pending merge.
So even if a view was active and the user only saw changes that impacted
the view, merge must be "normal" (full-tree + all changes committed)
behind the scenes. Right now, I make no attempt to sugar-coat that so
bzr view --switch off
(do merge)
bzr view --switch my
is the recipe needed, assuming the default view name is being used.
I guess I need to make that clearer in the doc.
Eduardo de Oliveira Padoan wrote:
> So, If I try to merge, it still needs to get the complete list of files.
> Ok. But 'bzr help view' (a quite long doc, btw :P) says:
>
> """
> To disable the current view without deleting it, you can switch to
> the pseudo view called ``off``. This can be useful when you need
> to see the whole tree for an operation or two (e.g. merge) but
> want to switch back to your view after that.
> """
>
> I guess that its because we will want to check 'bzr st' and etc before
> committing the merge (and so will need the whole list of affected
> files), or simply because the committing the merge will fail If we
> aren't viewing the whole tree?
The commit of the merge has to commit all the changes because Bazaar
doesn't support committing only some files if there's a pending merge.
So even if a view was active and the user only saw changes that impacted
the view, merge must be "normal" (full-tree + all changes committed)
behind the scenes. Right now, I make no attempt to sugar-coat that so
bzr view --switch off
(do merge)
bzr view --switch my
is the recipe needed, assuming the default view name is being used.
I guess I need to make that clearer in the doc.
Ian C.