On 04.09.2012 00:13, Kinkie wrote:
+1. this one looks better.
If it is easy please commit the $Id$ changes separately so we get a
cleaner
protos.h change patch. But this is just wishful thinking, if its not
easy
you have my +1 for go-ahead anyway.
Hi,
I've hit a bit of a snag: due to the fact that the main repository
is still in a very old format, there is no easy way to merge the
branch while preserving the revision history (I'm trying the hard
way,
but failure is an option).
Which leaves us with a choice:
- upgrade main repository to format 2a (requires bzr 1.16+, circa
2009)
- lose commit history for the merged branch (100 commits) and all
subsequent launchpad-hosted branches :\
I'd clearly favor the first option, but I remember that the issue was
already brought to the table and it was decided not to do it yet.
Thanks,
This is http://bugs.squid-cache.org/show_bug.cgi?id=3603 for the
sysadmin TODO list. Can you add these details about history to the
record there please.
FWIW: I'm in favour of the upgrade, it is a large part of the build
timeout issues on rio Debian sid build slave, it causes timeouts while
converting the repo changes and/or downloading large portions of repo
changeset data before for each test. It is also the reason I'm only
working with patches as merge candidates these days.
IIRC the objection was that 2a was relatively new at the time. A year
on that should no longer be an issue.
Amos
