Re: State of the repository conversion

[Steinar Bang]

>>>>> Eli Zaretskii <address@hidden>:

> Why is it more natural?  If the same bug exists on the trunk, you
> could fix it in either of the two places first.

I live in the land of refactoring, and one thing that happens
immediately after a branch for release, is that people tend to go wild
with refactoring that has been delayed pending the release.

So it makes most sense to look for the bug where it has been reported.

As for merging the fix into master: the master may have changed so much
that the fix doesn't make sense anymore.

That said, a merge has a better change at finding the correct place to
apply, in the refactoried code, than a cherry-pick does.  But the merge
result needs to be inspected after the merge.