i18n repo is broken
Matt Mackall
mpm at selenic.com
Wed Jan 2 00:22:42 CST 2013
This merge is wrong:
https://bitbucket.org/mg/hg-i18n/commits/ab78843c2fc6a412a73fe71564b7542319f091cd
It actually merges default into stable and nearly caused me to leak 2
months of development into a bugfix release. The only person in the
project who should ever do such a merge is me, which I do at the start
of the code freeze.
Really, there is no good reason to do cross-branch merges in the i18n
repo in either direction. I will end up doing all the necessary merges
from stable into default when I pull.
So: please do not do merges across named branches at all in the i18n
repo. At this point, all work there should happen strictly on the stable
branch, in the i18n/ directory.
Also, the i18n repo will need to be stripped of ab78843 and descendants,
as will any repos that have pulled from it.
--
Mathematics is the supreme nostalgia of our time.
More information about the Mercurial-devel
mailing list