Bug#493945: bzr rebase deletes not-checked-in files without warning

[Dwayne C. Litzenberger]

Package: bzr-rebase
Version: 0.3-1.1
Severity: important

"bzr rebase" just deleted my files before I had a chance to check them in.

Steps to reproduce:



    ~$ mkdir trunk
    ~$ cd trunk
    ~/trunk$ bzr init
    ~/trunk$ echo 'Hello world' > hello.txt
    ~/trunk$ bzr add -q hello.txt
    ~/trunk$ ~/trunk$ bzr commit -q -m 'Add hello.txt'


    ~/trunk$ cd ..
    ~$ bzr branch -q trunk new-feature
    ~$ cd new-feature
    ~/new-feature$ mkdir foo
    ~/new-feature$ cd foo
    ~/new-feature/foo$ echo 'lots of work' > file1
    ~/new-feature/foo$ bzr add -q file1
    ~/new-feature/foo$ bzr commit -q -m 'Add file1'
    ~/new-feature/foo$ echo 'hours of work, almost done' > important-new-file


    ~/new-feature/foo$ cd ../../trunk
    ~/trunk$ echo 'randomize ports' > security-fix
    ~/trunk$ bzr add -q security-fix
    ~/trunk$ bzr commit -q -m 'security fix'

* Switch back to new-feature and rebase to bring in the security fix:

    ~/trunk$ cd ../new-feature
    ~/new-feature$ ls foo
    file1  important-new-file
    ~/new-feature$ bzr rebase ../trunk
    All changes applied successfully.
    Committing to: /home/dwon/new-feature/
    added foo
    added foo/file1
    Committed revision 3.
    ~/new-feature$ ls foo
    file1

Result:

1. "important-new-file" is gone without warning after bzr rebase.
2. user is unhappy


-- System Information:
Debian Release: 4.0
  APT prefers testing
  APT policy: (500, 'testing')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.18-6-xen-686
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8)

Versions of packages bzr-rebase depends on:
ii  bzr                           1.1~rc1-1  easy to use distributed version co
ii  python                        2.4.3-11   An interactive high-level object-o
ii  python-central                0.6.8      register and build utility for Pyt

bzr-rebase recommends no packages.

-- no debconf information

--
Dwayne C. Litzenberger <[EMAIL PROTECTED]>
 Key-signing key   - 19E1 1FE8 B3CF F273 ED17  4A24 928C EC13 39C2 5CF7
 Annual key (2008) - 4B2A FD82 FC7D 9E38 38D9  179F 1C11 B877 E780 4B45

* Initialize a new branch called "trunk" (or whatever; the branch names don't matter.) ~/trunk$ * Create a copy of "trunk" called "new-feature", and do some work in it, including creating a directory and putting new files in it, checking in some of the changes but not all of them. ~/new-feature/foo$ * Switch back to "trunk" to make some changes that do not conflict with the files in "new-feature". ~/trunk$ ~/new-feature$

signature.asc
Description: Digital signature