Re: New SVN Wiki page
On Fri, Oct 28, 2005 at 01:30:13AM +0200, Giovanni Bajo wrote: Mike Stump [EMAIL PROTECTED] wrote: Uhm, I'm not sure how to explain this without being too pedantic. Does this sound clearer? This tool tracks each individual change (fine-grained) and will never reapply an already applied change. I think that is a high level answer, and completely answers the question to people that have the question, while doing as little as possible to confuse someone that doesn't even have the question. Anyone doing merges should have the question and understand the answer. Or, you can say it merges in N-1 to N, when one requests a merge of N. A totally different way of expressing the same thing, and conveys the same information. Sound reasonable? Thanks for the suggestion, I have incorporated this into the Wiki page, I hope it's clearer now. I just updated the cvs/svn shell on gcc.gnu.org. It now has the ability to add a v2 key to the system: ssh gcc.gnu.org 'updatekey' ~/.ssh/id_rsa.pub This will add the id_rsa.pub to the authorized_keys file on gcc.gnu.org. It will, of course, only work if you are already able to access the system. Should the wiki be updated to reflect this change? As a meta-issue, maybe we should actively promote that people update their keys and eventually turn off the v1 keys entirely? cgf
Re: New SVN Wiki page
On Fri, 28 Oct 2005, Christopher Faylor wrote: I just updated the cvs/svn shell on gcc.gnu.org. It now has the ability to add a v2 key to the system: ssh gcc.gnu.org 'updatekey' ~/.ssh/id_rsa.pub This will add the id_rsa.pub to the authorized_keys file on gcc.gnu.org. It will, of course, only work if you are already able to access the system. That's really, really cool. Thanks! Gerald
Re: New SVN Wiki page
On Fri, Oct 28, 2005 at 06:01:52PM +0200, Gerald Pfeifer wrote: On Fri, 28 Oct 2005, Christopher Faylor wrote: I just updated the cvs/svn shell on gcc.gnu.org. It now has the ability to add a v2 key to the system: ssh gcc.gnu.org 'updatekey' ~/.ssh/id_rsa.pub This will add the id_rsa.pub to the authorized_keys file on gcc.gnu.org. It will, of course, only work if you are already able to access the system. That's really, really cool. Thanks! You're welcome! Since we have better control of the connection to gcc.gnu.org now, are there any other things like this which would be useful to add, like maybe a ssh gcc.gnu.org mirror-repo or something? cgf
Re: New SVN Wiki page
Mike Stump [EMAIL PROTECTED] wrote: Uhm, I'm not sure how to explain this without being too pedantic. Does this sound clearer? This tool tracks each individual change (fine-grained) and will never reapply an already applied change. I think that is a high level answer, and completely answers the question to people that have the question, while doing as little as possible to confuse someone that doesn't even have the question. Anyone doing merges should have the question and understand the answer. Or, you can say it merges in N-1 to N, when one requests a merge of N. A totally different way of expressing the same thing, and conveys the same information. Sound reasonable? Thanks for the suggestion, I have incorporated this into the Wiki page, I hope it's clearer now. Giovanni Bajo
Re: New SVN Wiki page
Mike Stump [EMAIL PROTECTED] wrote: Ok, question about the merge tool. Does revision N mean all changes that predate N that apply, or just N-1 to N? N-1 to N. You can specify a single commit and it will apply only that. So, let's say that 3, 4, 5, 6, 7 are available, can I merge 3 today, then 6, the next day, then 5, then all the rest (4 and 7) the next day? If yes, this corresponds to a N-1 to N above. Yes. The good thing is that it'll keep track of what you've merged, so the list of available revisions will trim down as you go. Could you update the doc to reflect your answer. Uhm, I'm not sure how to explain this without being too pedantic. Does this sound clearer? To do partial merges or cherry-picking, you can pass -r/--revision to svnmerge merge and name the single commit (or range of commits). Giovanni Bajo
Re: New SVN Wiki page
On Oct 25, 2005, at 12:50 AM, Giovanni Bajo wrote: Uhm, I'm not sure how to explain this without being too pedantic. Does this sound clearer? This tool tracks each individual change (fine-grained) and will never reapply an already applied change. I think that is a high level answer, and completely answers the question to people that have the question, while doing as little as possible to confuse someone that doesn't even have the question. Anyone doing merges should have the question and understand the answer. Or, you can say it merges in N-1 to N, when one requests a merge of N. A totally different way of expressing the same thing, and conveys the same information. Sound reasonable?
New SVN Wiki page
Hello, I have rehauled http://gcc.gnu.org/wiki/SvnHelp. I'm almost done with it (should be ready tomorrow), but only a few things are missing now. I believe I have integrated all the issues raised during the past week in the mailing list. Also, I have added new information (especially for branch maintaieners), and reorganized information so that they are hopefully easier to find. Let me know if I have missed something. Feel free to fix typos and rephrase my bad English, but I'd like to know if you plan on adding something substantial, so to find the best place to put it and not to duplicate information. Thanks, -- Giovanni Bajo
Re: New SVN Wiki page
Giovanni Bajo wrote: Hello, I have rehauled http://gcc.gnu.org/wiki/SvnHelp. I had a look earlier today and liked a lot! Thanks! Paolo.
