[bug?] 'bzr unshelve --all' leaves file.ext.orig files in working tree
John Arbash Meinel
john at arbash-meinel.com
Mon Dec 4 13:57:56 GMT 2006
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Alexander Belchenko wrote:
> After unshelving changes back to working tree with 'bzr unshelve --all'
> I see that changed files have original copies (e.g., file.ext touched by
> unshelve has original file.ext.orig). This behaviour I discover recently
> (week or two). Probably it's a bug, I don't think it's really needed.
>
> I use shelve from bzrtools.
>
> Alexander
>
I *think* 'unshelve' calls out to 'patch'. Which always creates .orig
files if the patch does not apply exactly. (if it has to move by a
couple lines).
I could be wrong, but that is my understanding.
John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQFFdClkJdeBCYSNAAMRAipDAJ0UnieT6xNR4hGkDpP7nbtSd+5T6gCeLo5s
IZfsueeUs0WBAKbJ4PKwYtk=
=EOM5
-----END PGP SIGNATURE-----
More information about the bazaar
mailing list