Bazaar

update says "successful" even when there are pre-existing conflicts

Bug #680536 reported by Jon Loldrup on 2010-11-23

This bug affects 1 person

Affects		Status	Importance	Assigned to	Milestone
	Bazaar	Confirmed	Low	Unassigned

Bug Description

This:

loldrup@explab:~$ cd repo/trunk/
loldrup@explab:~/repo/trunk$ bzr update
M src/src/dmCache.py
M src/src/dmHandler.py
M src/src/main.py
M src/src/node.py
All changes applied successfully.
Updated to revision 127 of branch sftp://<email address hidden>/home/bzrusr/repo/trunk

makes me think everything is good while indeed there are conflicts! The text "All changes applied successfully." simply doesn't have "errors may be present" as a closely associated thought!

loldrup@explab:~/repo/trunk$ bzr conflicts
Text conflict in src/src/node.py
loldrup@explab:~/repo/trunk$

Tags:

Revision history for this message

Jon Loldrup (loldrup) wrote on 2010-11-23:

bazaar_misguiding.png Edit (101.8 KiB, image/png)

Revision history for this message

Robert Collins (lifeless) wrote on 2010-11-23: Re: [Bug 680536] Re: Bazaar message sequence is misguiding

I think you already had conflicts?

Martin Pool (mbp) on 2010-11-23

Changed in bzr:
status:	New → Incomplete
importance:	Undecided → Low
status:	Incomplete → Confirmed
summary:	- Bazaar message sequence is misguiding
summary:	+ update says "successful" even when there are pre-existing conflicts