> When updating something at the bottom of the stack it
> is boring to do up-thread; commit repeatedly, and the user
> may just want the same message for all.
> It would be possible to have a way to do them all at
> once using the same message for each, stopping if there
> is a conflict to resolve.
>
> However, I realise this goes against bzr's philosophy
> on merges, and so may be rejected.
given that the loom itself provides a meta-status, you can revert the
entire loom to undo all the merges done to threads since the last
'record', I don't think that the bzr philosophy is violated; we're just
moving up a level. However, I think we should at minimum provide a hook
to test each thread as the merge progesses.
For instance, one could have in branch.conf
thread_test = 'make check'
then 'bzr switch upstream && bzr pull && bzr up-thread -a -m "Merging
upstream."' will run 'make check' as it goes up each thread, stopping at
the first error but otherwise committing with 'Merging upstream.'
> When updating something at the bottom of the stack it
> is boring to do up-thread; commit repeatedly, and the user
> may just want the same message for all.
> It would be possible to have a way to do them all at
> once using the same message for each, stopping if there
> is a conflict to resolve.
>
> However, I realise this goes against bzr's philosophy
> on merges, and so may be rejected.
given that the loom itself provides a meta-status, you can revert the
entire loom to undo all the merges done to threads since the last
'record', I don't think that the bzr philosophy is violated; we're just
moving up a level. However, I think we should at minimum provide a hook
to test each thread as the merge progesses.
For instance, one could have in branch.conf
thread_test = 'make check'
then 'bzr switch upstream && bzr pull && bzr up-thread -a -m "Merging
upstream."' will run 'make check' as it goes up each thread, stopping at
the first error but otherwise committing with 'Merging upstream.'
status triaged
importance high
-Rob
-- www.robertcolli ns.net/ keys.txt>.
GPG key available at: <http://
>