Oddness in local commits
Erik Bågfors
zindar at gmail.com
Mon Mar 27 20:29:13 BST 2006
I just got a strange error when playing around with bound branches. I
tried to repeat the problem and ran into another one. The second one
is repeatable.... here is a sequence of commands that gives strange
errors
mkdir a
cd a
bzr init
cp /etc/hosts .
bzr add
bzr ci -m hosts
cd ../
bzr checkout a aa
cd aa
echo hej > hosts
bzr ci --local -m f
bzr update
bzr ci --local -m ff
bzr update
bzr ci --local -m fff
bzr update
bzr ci -m 'merge'
cd ../a
bzr revert
Here I get
- [======= ] Revert
phase 0/4bzr: WARNING: Conflict adding file hosts~. Moved existing
file to hosts~.moved.
Which is NOT something I would expect...
/Erik
More information about the bazaar
mailing list