Unversioned files are deleted by rebase

Bug #1009075 reported by IWATA Hidetaka
6
This bug affects 1 person
Affects Status Importance Assigned to Milestone
bzr-rewrite
Triaged
Medium
Unassigned

Bug Description

Unversioned files are deleted by rebase with no confirmation.

To reproduce:

1. make "trunk"
 $ bzr init trunk
 $ cd trunk
 $ echo foo>foo
 $ bzr add
 $ bzr commit -m "1st commit"

2. make "test" branch from "trunk"
 $ bzr branch . ..\test

3. Add sub directory to "trunk"
 $ bzr mkdir subdir
 $ bzr commit -m "add subdir"

4. Add file into sub directory and leave it unversioned
 $ echo bar>subdir\bar

5. commit some changes in "test"
 $ cd ..\test
 $ echo fooo>foo
 $ bzr commit -m "modify foo"

6. rebase "test" into "trunk"
 $ cd ..\trunk
 $ bzr rebase ..\test

Then, subdir\bar is lost.
I think rebase should stop is such situations.

==
Bazaar (bzr) 2.5.1dev
  Python interpreter: C:\DEVELOP\py_envs\bzr2.5-mingw\Scripts\python.exe 2.7.2
  Python standard library: C:\DEVELOP\py_envs\bzr2.5-mingw\lib
  Platform: Windows-7-6.1.7601-SP1
  bzrlib: C:\DEVELOP\py_envs\bzr2.5-mingw\lib\site-packages\bzrlib
  Bazaar configuration: C:/Users/iwata/AppData/Roaming/bazaar/2.0
  Bazaar log file: C:\Users\iwata\Documents\.bzr.log

Revision of bzr-rewrite : r256

Jelmer Vernooij (jelmer)
Changed in bzr-rewrite:
status: New → Triaged
importance: Undecided → Medium
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.