Bazaar

  1. Bug #127115
  2. Comment #0

Comment 0 for bug 127115

Revision history for this message
Vincent Ladeuil (vila) wrote : dirstate breaks merge --uncommitted

#!/bin/bash
rm -fr bug
mkdir bug
cd bug
bzr init base
cd base
echo blabla > a
bzr add a
bzr commit -m 'Adding a'
cd ..
bzr branch base branch
cd base
# bzr mv a b
echo talk properly > a
cd ../branch
bzr merge --uncommitted ../base

I first encounter the problem while renaming a file (see the commented out command above), but even just changing the content triggers the bug.