On Wed, 2004-10-13 at 09:02 +0200, Christian Perrier wrote: > The Swedish translator mentioned me he commited updates to the man > pages to the CVS... > Yeah, peterk does have access; iirc. Jordi Mallach has as well for the Catalan translations. > I grabbed them and put them in my own copy...then commited, synced the > archive-mirror...and, finally, I made a merge with your own copy. > You didn't really need to do the merge from my devo archive, there's nothing except merges with you. > However, just later I realised you may have something already ready > for not losing commits to the CVS if I interpret properly the > following: > Indeed. > bubulle@mykerinos:~/src/debian/dpkg-1.10> tla log-versions > bubulle@debian.org--2004/dpkg--devo--1.10 > scott@netsplit.com--2004/dpkg--cvs--0 > scott@netsplit.com--2004/dpkg--cvs--1.10 > scott@netsplit.com--2004/dpkg--devo--1.10 > scott@netsplit.com--2004/dpkg--svn--1.10 > > The scott@netsplit.com--2004/dpkg--cvs--1.10 branch is probably the > CVS, right? So you probably have everything for merging back to your > dev branch the things people may commit to the CVS.... > Yeah, basically I have a few scripts that allow me to grab CVS changes and stuff them into the dpkg--cvs--1.10 arch repository. I can then merge them onto devo, and likewise merge changes from devo back onto cvs which commits them to CVS. It's a bit hacky, but it works. In this particular case peterk's changes are on dpkg--cvs--1.10; but it's fine that you've put them in your own archive -- I'll just merge from you instead. btw. I realised I forgot to mention this, but -- ChangeLog entries should only carry your name if you did the majority of the work. Where we get patches or files from others, the ChangeLog entry should carry *their* name and e-mail address. This applies to translations, especially. And for peterk's stuff, there's no need to mention that it was grabbed from CVS in debian/changelog (user's don't care), just list Swedish under updated translations or manpages along with any relevant bug# (if any). Scott -- Have you ever, ever felt like this? Had strange things happen? Are you going round the twist?
Attachment:
signature.asc
Description: This is a digitally signed message part