Bazaar

Confusing merge conflict message when directory removed

Bug #47764 reported by Brad Bollenbach on 2006-05-31

Affects		Status	Importance	Assigned to	Milestone
	Bazaar	Fix Released	Medium	Aaron Bentley

Bug Description

bradb@ozone:~/canonical/malone-xmlrpc$ bzr merge ../launchpad-upstream/
bzr: WARNING: Conflict adding files to lib/canonical/rosetta. Not deleting.
1 conflicts encountered.

This error message is a confusing contradiction. Here's a quick alternate suggestion, though I'm sure it can be improved.

bzr: WARNING: The following directories were removed from the branch you merged from, but could not be removed from your branch because they contain files not under version control:

lib/canonical/rosetta

Perhaps these directories contain ignored files? See "bzr help ignored".

See original description

Tags:

Brad Bollenbach (bradb) on 2006-05-31

description:

updated

Revision history for this message

Aaron Bentley (abentley) wrote on 2006-05-31: Re: [Bug 47764] Confusing merge conflict message when directory removed

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Brad Bollenbach wrote:
> Public bug reported:
>
> bradb@ozone:~/canonical/malone-xmlrpc$ bzr merge ../launchpad-upstream/
> bzr: WARNING: Conflict adding files to lib/canonical/rosetta. Not deleting.
> 1 conflicts encountered.
>
> This error message is a confusing contradiction. Here's a quick
> alternate suggestion, though I'm sure it can be improved.

Agreed. The case it describes (adding files to a deleted directory) can
also happen, but the two cases need to have different messages, even
though they have the same symptom.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFEffbG0F+nu1YWqI0RAuPrAJ9ofiF2Uncr7r80+kJr905+cXgCLwCfbzLB
ukU2KKp2LSwVnqiAuhsRIPM=
=x9hU
-----END PGP SIGNATURE-----

Aaron Bentley (abentley) on 2006-09-06

Changed in bzr:
assignee:	nobody → aaron-bentley
status:	Unconfirmed → Fix Committed

Revision history for this message

Martin Pool (mbp) wrote on 2010-02-11:

Aaron, this was previously (anciently) marked fix-committed. Do you have a patch for this?

tags:	added: conflicts ignore merge
Changed in bzr:
status:	Fix Committed → In Progress

Martin Pool (mbp) on 2010-02-11

tags:

added: easy

Revision history for this message

Aaron Bentley (abentley) wrote on 2010-02-12:

No, I don't. Are you sure it's still happening, and not a similar error message, and not this message in different circumstances?

Revision history for this message

Martin Pool (mbp) wrote on 2010-02-12:

I'm not sure it's still happening.

Changed in bzr:
status:	In Progress → Incomplete

Revision history for this message

Eric Siegerman (eric97) wrote on 2011-03-19:

It's not still happening.

It appears to have been fixed in r1987. (It's verified fixed as of r4230, but that rev introduces a format horizon that prevents me from testing (easily enough to be worth the bother) any further back than that.)