qrevert: With pending merges, unchecked files are reverted. (Data Loss!)

Bug #516522 reported by Gary van der Merwe
6
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
Revision history for this message
Alexander Belchenko (bialix) wrote : Re: [Bug 516522] [NEW] qrevert: With pending merges, unchecked files are reverted. (Data Loss!)

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
need to `pull . -r revid:pending-merge-tip --overwrite` instead.

Revision history for this message
Alexander Belchenko (bialix) wrote :

Gary, I've tried to reproduce your steps. Uncommitted changes in file 2 is properly backed up as file.ext.~1~. So there is no real data loss.

Changed in qbzr:
importance: Critical → High
Revision history for this message
Alexander Belchenko (bialix) wrote :

I'm sure this bug occurs because of the problem with select all checkbox: it should takes 3rd state when some files unchecked in file view. See bug https://bugs.launchpad.net/qbzr/+bug/524483

To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.