qcommit on checkout should provide an update option when checkout out of date
Bug #439920 reported by
Craig Hewetson
This bug affects 1 person
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
QBzr |
Fix Released
|
Low
|
Gary van der Merwe |
Bug Description
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.
Example:
The bound branch is out of date with the master. Do you wish to update?
This then allows the user to run the update and on closing this view will refresh the qcommit dialog (refresh the list of changes).
Thereby allowing the user to continue commiting changes.
This is extremely useful if the update produces changes that don't effect your code (Which happens quite often where I work.)
Related branches
tags: | added: qcommit qupdate |
Changed in qbzr: | |
status: | New → Won't Fix |
To post a comment you must log in.
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.