Comment 8 for bug 956268

Revision history for this message
Alex Lewis (alexlewis-deactivatedaccount) wrote :

Ok here's the steps to reproduce a setup which caused my confusion...

...in new empty directory "bzr"...
bzr init-repo .
bzr init trunk
cd trunk
touch file1.txt
touch file2.txt
bzr add
bzr commit -m "Initial commit"
cd ..
mkdir branches
bzr branch trunk/ branches/feature-x
cd trunk
bzr remove file1.txt
bzr commit -m "Removing file1"
cd ../branches/feature-x
vi file2.txt (Make a change to the file, add some text)
bzr commit -m "Added some text"
cd ../../
bzr explorer .
-- Open the "branches/feature-x" folder.
-- The bottom panel now shows "file1.txt" as "Added" and file2.txt as "Modified". Personally I would have expected only to see file2.txt as modified but I can now see why the other file is listed there.
-- Exit Bazaar Explorer
cd trunk
bzr merge ../branches/feature-x
-- The output says only about the modification to file2.txt and does nothing with file1.txt.

So in my opinion the output in the bottom panel made me think that file1.txt would have reappeared in trunk when doing a merge (merging feature-x into trunk I mean). Bazaar actually behaved as I initially expected and just showed the change to file2.txt and did nothing with file1.txt.

So is this a bug in Bazaar Explorer, just a different approach taken by Explorer compared to Bazaar or just my own confusion? Please feel free to pick the last option :)

Hopefully I've been clear and made sense, apologies if not.