Data loss: replay does not include merged revisions
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| bzr-rewrite |
Triaged
|
High
|
Unassigned | ||
Bug Description
A replay on a branch does not include any merged revisions. This leads to data loss and large inconsistancies between the source branch and the target branch.
Steps to reproduce:
================
bzr branch lp:openobject-addons/7.0 openobject-
cd openobject-
bzr uncommit -r 8643; bzr revert
bzr replay lp:openobject-addons/7.0 -r 8644
bzr diff . -r 8643..8644 --diff-options -q
Expected results:
==============
=== modified file 'google_
Files google_
(This is output of 'bzr diff lp:openobject-addons/7.0 -r 8643..8644 --diff-options -q')
Actual results:
============
No changes in the working tree.
Installed version of bzr-rewrite: 0.6.3
| Jelmer Vernooij (jelmer) wrote Re: [Bug 1115237] [NEW] Data loss: replay does not include merged revisions | #1 |
| Changed in bzr-rewrite: | |
| importance: | Undecided → High |
| status: | New → Triaged |
On Mon, 2013-02-04 at 13:32 +0000, Stefan Rijnhart (Therp) wrote:
> Public bug reported:
>
> A replay on a branch does not include any merged revisions. This leads
> to data loss and large inconsistancies between the source branch and the
> target branch.
status triaged
importance high
Please note that the replay command is hidden because it still has a
number of open issues like this.
Cheers,
Jelmer