[MERGE REVIEW] remerge correctly handles single-file arguments

Aaron Bentley aaron.bentley at utoronto.ca
Mon Feb 27 22:12:50 GMT 2006


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

Hi all,

The Tree Transform work contained a regression affecting remerge; we
lost the ability to specify particular files to re-merge.

This patch corrects this, and also throws NotVersioned if requested to
remerge an unversioned or non-existant file.

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

iD8DBQFEA3li0F+nu1YWqI0RAo+PAJ9qDsSKPOwwJs0/nIkPlcOU3NdDLQCfVwZe
Mm5hYtTA/Q2sXMVkD/mUrwM=
=B9IT
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: remerge-fixes.patch
Type: text/x-patch
Size: 5666 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060227/4ac92bd6/attachment.bin 


More information about the bazaar mailing list