On Saturday 23 January 2016 12:20 AM, Ximin Luo wrote:
On 20/01/16 18:29, Rahul Amaram wrote:
(d) The git history for the debian/wheezy branch of calendarserver is also
messed up - you have version 3.2 committed on top of 5.2.2. It involves a bit
of git magic to fix, which I can do, if you want to avoid the hassle yourself
and you give me access.
I've also asked to be added to the calendarserver group on Alioth, so that I
can make these changes myself.
Feel free to do the changes. Not sure how it got messed up. Thanks.
OK, I've rewritten the history so things make more sense looking at the logs - all the
"Imported Upstream version" commits are now in the correct linear sequence, as well as
the "Imported Debian patch" commits, and debian/wheezy branches away from the main
history at the correct place.
You'll need to update your own repo to point all your local branches to the new
rewritten history. If it's too messy, you can just clone it again.
For transparency, I've attached the script I used, which is a combination of
writing .git/info/grafts and git-filter-branch. You can run it on your own
local old repo, and in theory you should even get the same commit SHA1 objects
out. (But be careful! This will drop the gpg signatures on some old tags, so be
careful not to push these back out.)
For reference, here's what you should expect the script to output, twice, to
check that I didn't backdoor the source :)
================
debian/3.2+dfsg-4+deb7u1 fe8398cfe0b68277b4c95e116e8d37e6b88f5061
debian/3.2+dfsg-4+deb7u2 fb51628bb376ea59c7650a213a698b9c913f2f08
debian/3.2+dfsg-4+deb7u3 2254a4d52ff2338cf803e04a68656ae22571a668
debian/5.2.2+dfsg-1 612b68e1fc65c75cff8e23e860cd7e9d4e67db78
debian/5.2.2+dfsg-2 a7c22e20c5ca1d7d117f6130fac65c445b685361
debian/5.2+dfsg-1 9ea1e23624d0f0e8415ee4f248e7328c355c1e44
debian/sid 4e10242c8786ed237654dc3badfcae13742881a4
debian/wheezy 2254a4d52ff2338cf803e04a68656ae22571a668
dfsg/3.2+dfsg 1e54e2ea03c6729ae01f55771d1a62d8583d8d37
dfsg/6.2+dfsg 8792d5025eaf7babc5d7e79aca52d22f16f69acb
dfsg/7.0+dfsg 0b8deb3e9e47d68def2ea19699bb5faf88169e8c
dfsg/sid 0b8deb3e9e47d68def2ea19699bb5faf88169e8c
dfsg/wheezy 1e54e2ea03c6729ae01f55771d1a62d8583d8d37
upstream/5.2.2+dfsg c5f692769be97e5757fe6f8ee6082ef70c2386b0
upstream/5.2+dfsg 45caacfffe16dd80e9052b0797f588014de4008b
upstream/6.2 53592e714f2a8ff81f4bc0a6ac6153f703beec4b
upstream/7.0 d7604402e323a79dd8275c313c5b2377a3b35b7c
upstream/sid d7604402e323a79dd8275c313c5b2377a3b35b7c
================
X
Thanks. I've just cloned the repo again.
