Bazaar Mercurial Plugin to access BitBucket

Martin Geisler mg at lazybytes.net
Thu Oct 20 20:44:02 UTC 2011


"Stephen J. Turnbull" <stephen at xemacs.org> writes:

> Martin Geisler writes:
>
>  > > Does Mercurial explicitly track directories (including empty
>  > > directories)?
>  > 
>  > No, like Git, Mercurial only tracks files.
>
> Well, I don't know what Ben meant by "correct rename tracking", but
> Mark Shuttleworth always brags about Bazaar "correctly" tracking
> directories, as well as files, as versionable objects.

Yes, we've noticed that, and we've been busy trying to defuse this ever
since... :-) It started around 2007:

  http://www.markshuttleworth.com/archives/123#comment-107572

where Mark writes that "It’s easy to show it break" about Mercurial's
merge algorithm, but neglects to provide an example. We might have had a
bug in 2007, but we can't know for sure if it's been fixed since we
don't have a bug report to compare with.

> Since we're on bazaar at canonical, I think I'll accept Mark's definition
> (as much as in my own usage I'll probably be perfectly happy with hg's
> behavior<wink>).

Hehe :) We don't see much talk about merges gone wrong because of our
rename tracking -- but we sometimes see problems because people forgot
to explictly tell Mercurial that "foo" was renamed into "bar" (they just
deleted "foo" and added "bar" as a new file). So we've considered making
Mercurial do what Git does: detect renames on-the-fly when merging.

I guess Bazaar users have the same problem from time to time? If so, is
there a good way to recover and feed the correct rename information to
Bazaar?

-- 
Martin Geisler

Mercurial links: http://mercurial.ch/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/bazaar/attachments/20111020/1fd8a3e5/attachment.pgp>


More information about the bazaar mailing list