revert after merge doesn't delete directories added by merge itself

Bug #54172 reported by Alexander Belchenko
2
Affects Status Importance Assigned to Milestone
Bazaar
Fix Released
Medium
Aaron Bentley

Bug Description

Reproduction of problem (in fresh bzr.dev):

$ bzr init a
$ cd a
$ bzr mkdir dir
added dir
$ cd dir
$ echo spam > spam
$ bzr add spam
added dir/spam
$ cd ..
$ bzr ci -m initial
added dir
added dir/spam
Committed revision 1.
$ cd ..
$ bzr branch a b
Branched 1 revision(s).
$ cd b
$ cd dir
$ bzr mkdir subdir
added subdir
$ cd subdir
$ echo foo > bar
$ bzr add bar
added dir/subdir/bar
$ cd ..
$ cd ..
$ bzr ci -m subdir
added dir/subdir
added dir/subdir/bar
Committed revision 2.
$ bzr ls
dir
dir/spam
dir/subdir
dir/subdir/bar
$ cd ..
$ cd a
$ bzr merge ../b
All changes applied successfully.
$ bzr st
added:
  dir/subdir/
  dir/subdir/bar
pending merges:
  Alexander Belchenko 2006-07-26 subdir
$ bzr revert
$ bzr st
unknown:
  dir/subdir
$ bzr ls
dir
dir/spam
dir/subdir

File 'dir/subdir/bar' is actually deleted but 'subdir' is not.

Revision history for this message
John A Meinel (jameinel) wrote :

This bug is also present in 0.8, so I'm not making it a priority for 0.9. But we should try to fix it before the next release.

Changed in bzr:
importance: Untriaged → Medium
status: Unconfirmed → Confirmed
Revision history for this message
John A Meinel (jameinel) wrote :

bumping to 0.11

Aaron Bentley (abentley)
Changed in bzr:
status: Confirmed → Fix Committed
assignee: nobody → aaron-bentley
Aaron Bentley (abentley)
Changed in bzr:
status: Fix Committed → Fix Released
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.