Conflict in file supposed to be out of version control

[John Arbash Meinel]

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

On 1/14/2011 11:06 AM, Krilin Wantun wrote:
> Hello, can anybody tell me what does this mean?
> 
> conflicts:
>   Contents conflict in admin/imagenes/menu_usuario/logo_menu.png
> 
> It appears when I do "bzr status", plus a number of unknown list of
> files and directories.
> 
> This file I've done bzr -ignore, bzr -remove and bzr -remove --force an
> d it's still there, it's supposed to be out of the version control but
> it appears there, how can I get it out from control version? and how can
> I resolve this conflict?
> 
> This is what I get trying to resolve:
> 
>>bzr resolve
> 0 conflict(s) auto-resolved.
> Remaining conflicts:
> Contents conflict in admin/imagenes/menu_usuario/logo_menu.png
> 
>>bzr resolve admin/menu_usuario/logo_menu.png
> admin/menu_usuario/logo_menu.png does not exist
> 
>>bzr resolve admin/menu_usuario/logo_menu.png
> admin/menu_usuario/logo_menu.png does not exist
> 


You are missing the path:
Contents conflict in admin/imagenes/menu_usuario/logo_menu.png
         bzr resolve admin/menu_usuario/logo_menu.png

You are missing "imagenes" in your path. It should be:

bzr resolve admin/imagenes/menu_usuario/logo_menu.png

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk0wmxwACgkQJdeBCYSNAAPGnwCgoNG8Lyu/tioQGuDD0dOcpLXk
Q8MAoL2JXqjF54jKrtqzWfP7GFx29bvz
=Rg7N
-----END PGP SIGNATURE-----