qcommit on checkout should provide an update option when checkout out of date

Craig Hewetson пишет:
> Current Problem:
> We work with checkouts or bound branches.
> When the checkout is out of date with the master then qcommit displays an error message and tells the user to run update.
>
> Recommendation:
> When the commit fails, open the qupdate dialog with a slightly different title.

Currently qcommit run bzr as subprocess and don't have enough info about
the reason why commit failed. So I'm sure there is possible situations
when running qupdate will be wrong thing.

If your operation was failed and you close qcommit then your commit
message will be saved and restored next time. So it should be pretty
safe to close qcommit, run qupdate and again run qcommit.

In general case qupdate *can* produce conflicts. So committing just
after update could be a wrong thing.

>
> In general case qupdate *can* produce conflicts. So committing just
> after update could be a wrong thing.
>

Committing with conflicts won't be possible and will result in an error.

But I think they way it works now is good enough, I suppose the person that
complained about this to me
will eventually get use to it.

Closing this bug will be ok.

Craig Hewetson пишет:
>> In general case qupdate *can* produce conflicts. So committing just
>> after update could be a wrong thing.
>>
>
> Committing with conflicts won't be possible and will result in an error.
>
> But I think they way it works now is good enough, I suppose the person that
> complained about this to me
> will eventually get use to it.
>
> Closing this bug will be ok.

I think we'd better to not over complicate qcommit dialog. It's already
very heavy.

While the suggestions as to how to fix this may not be agreeable, I feel that this is still a bug. I fact there are many more situations where you have to first close a dialogue, do something in another, and then go back to your first. We can't hope to be aware of all such situations/work flows, hence I feel that this bug report is valuable, hence reopening...

I started running into this situation alot and now decided to start working on this feature.
Would a button called "update" next to the "diff" button adequate? Also this button should only be visible when there is a master branch.

Also on a update should I execute the following:
self.process_widget.do_start(None, 'update', self.tree.branch.base)
only problem with the above is that the commit dialog closes.

My fix relies on this patch to bzr core for bound branches:
https://code.launchpad.net/~garyvdm/bzr/commit-BoundBranchOutOfDate/+merge/20393

Hi Gary,

Thanks for the fix, would this be available in bzr 2.2.x? or in bzr 2.1.x?

On 02/03/2010 15:18, Craig Hewetson wrote:
> Hi Gary,
>
> Thanks for the fix, would this be available in bzr 2.2.x? or in bzr
> 2.1.x?

Yhea, the timing on this on sucks. 6 months till the next stable release.

My gut feel is that that it should not go in to bzr 2.1. But it wont do
any harm to ask.

Well atleast the fix is in place, when its available, I know that a lot of
my colleges are going to like the feature.
Thanks alot.