qrevert: With pending merges, unchecked files are reverted. (Data Loss!)
Bug #516522 reported by
Gary van der Merwe
This bug report is a duplicate of:
Bug #524483: qrevert: Select all checked even if there is some files unchecked.
Edit
Remove
This bug affects 1 person
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
QBzr |
Confirmed
|
High
|
Gary van der Merwe |
Bug Description
Steps to repduce:
In bound branch:
* make change 1.
* commit --local
* make change 2.
* update (with changes in master)
This results in a pending merge.
* run qrevert
* uncheck the file with change 2.
This runs bzr revert (no params) which results in the unchecked file bening reverted.
Changed in qbzr: | |
assignee: | nobody → Gary van der Merwe (garyvdm) |
importance: | Undecided → Critical |
status: | New → Confirmed |
To post a comment you must log in.
Gary van der Merwe пишет:
> Public bug reported:
>
> Steps to repduce:
>
> In bound branch:
> * make change 1.
> * commit --local
> * make change 2.
> * update (with changes in master)
>
> This results in a pending merge.
>
> * run qrevert
> * uncheck the file with change 2.
>
> This runs bzr revert (no params) which results in the unchecked file
> bening reverted.
I suppose revert in the case of pending merge (from commit --local) is
not what user actually want, right?
If user want to restore local commits to the state before update then we merge-tip --overwrite` instead.
need to `pull . -r revid:pending-