Project

General

Profile

Bug #8930

bzr bug when moving files

Added by Constantin Asofiei about 2 years ago. Updated almost 2 years ago.

Status:
New
Priority:
Normal
Assignee:
-
Target version:
-
Start date:
Due date:
% Done:

0%

billable:
No
vendor_id:
GCD
case_num:
version_reported:
version_resolved:
reviewer:
production:
No
env_name:
topics:

History

#1 Updated by Constantin Asofiei about 2 years ago

The recreate for this bzr bug is:
  • create a bzr project
    bzr init demo
bzr co demo trunk
  • checkout a trunk, create some files:
    cd trunk
mkdir src
echo > src/f1.txt
echo > f2.txt
echo > f3.txt
bzr add .
bzr commit -m "commit 1" 
cd ../
  • create a branch, make a change so is ahead of trunk:
    bzr branch trunk v1
cd v1
echo "test" >> src/f1.txt
bzr commit -m "commit branch 2" 
cd ../
  • go to trunk, move existing files to new folder:
    cd trunk
mkdir foo
bzr add .
bzr mv f2.txt foo
bzr mv f3.txt foo
bzr commit -m "commit move files" 
cd ../
  • try to rebase the branch, it fails:
    cd v1
bzr rebase ../trunk
brz: ERROR: Key b'foo-20240705092524-6jlqqgx94u1ddmf7-1' is already present in map

This is not the only way to trigger this bug.

#2 Updated by Constantin Asofiei about 2 years ago

The test was done with:

$ bzr --help
Breezy 3.2.1 -- a free distributed version-control tool
https://www.breezy-vcs.org/

on
Distributor ID: Ubuntu
Description:    Ubuntu 22.04.4 LTS
Release:        22.04
Codename:       jammy

#3 Updated by Constantin Asofiei about 2 years ago

With 3.2.1, I've tried to revert to rev 10680, but it fails because of rev 10961 which moves a file.

This is definitely a breezy bug - we need to try and check different (older or newer) breezy revisions where this bug is not present.

On a machine where I have bazaar rev 2.8.0dev1 bzr revert -r 10680 works.

#4 Updated by Roger Borrello about 2 years ago

I'm not sure what project you are referring to when you mentioned:

With 3.2.1, I've tried to revert to rev 10680, but it fails because of rev 10961 which moves a file.

I have not rebased any of my branches since revision 15310 of trunk. Will I be able to rebase to trunk revision 15327?

#5 Updated by Constantin Asofiei about 2 years ago

Roger Borrello wrote:

I'm not sure what project you are referring to when you mentioned:

With 3.2.1, I've tried to revert to rev 10680, but it fails because of rev 10961 which moves a file.

I have not rebased any of my branches since revision 15310 of trunk. Will I be able to rebase to trunk revision 15327?

Yes, that will work.

#6 Updated by Galya B almost 2 years ago

Continuing from #7143-1146 - #7143-1158.

Andrei, I checked out 8019a locally and was able to rebase on trunk. I guess the issue is either some rebase plugin version incompatibility, or locally corrupt .bzr dir in one of the branches. In any case someone else should be able to rebase the branch, or help with installing the rebase plugin on devsrv01.

Also available in: Atom PDF