Question about "bzr merge --force"

Aaron Bentley aaron at aaronbentley.com
Thu Apr 2 08:14:08 CDT 2009


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

Greg Ward wrote:
> With Bazaar 1.13, the "merge --force" fails:
> 
> bzr: ERROR: Working tree
> "/home/greg/src/hg/tests/tmp/test-multimerge/source/" has uncommitted
> changes.

> Is this a bug in Bazaar 1.13?

Yes.  It was fixed in 1.13.1

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

iEYEARECAAYFAknUuiAACgkQ0F+nu1YWqI2EfgCcDFwW92P4C2Ag3Uh2UIiVA67U
ut8AoIJqhGS4peZRw5zP/s2bf1u2bPrR
=Ddf2
-----END PGP SIGNATURE-----


More information about the Mercurial-devel mailing list