VersionedFile.walk deprecated?
Martin Pool
mbp at sourcefrog.net
Tue Apr 11 05:37:26 BST 2006
On 11/04/2006, at 1:43 PM, Aaron Bentley wrote:
>
> So it sounds like we can't provide VersionedFile.walk in the public
> API,
> then. So it should be deprecated on VersionedFile, but not on Weave.
Right.
>
> | What
> | they can give is an iteration of the lines still present in each
> side,
> | and the annotation of when they came in. So a line present on
> the left
> | side can be judged to be either unborn, still living, or killed
> on the
> | right side, and vice versa.
>
> So, it sounds to me like both knit and weave can support
> plan_merge, but
> weave will implement it one way, and knit another. If so,
> VersionedFile
> shouldn't implement plan_merge(WeaveFile should), and my patch that
> moves it into PlanWeaveMerge is also wrong.
Well, it could be abstract (and currently inunimplemented) in
VersionedFile.
> Have I got it straight?
Yes.
--
Martin
More information about the bazaar
mailing list