http://permalink.gmane.org/gmane.comp.debugging.archer hourly 1 1901-01-01T00:00+00:00 http://gmane.org/img/gmane-25t.png http://gmane.org http://permalink.gmane.org/gmane.comp.debugging.archer/2547 <pre>Hi - Please be aware that **next week**, we will attempt to switch over the hardware that serves sourceware.org and its aliases (gcc.gnu.org, ecos.sourceware.org, cygwin.com, etc.) to newer &amp; faster hardware donated by Red Hat. The plan is to take down network services next Monday around 14:00Z, and gradually bring things back up on the new machine, one service at a time, as quickly as possible. Since this change involves switching to a much younger OS and is complicated by many sourceware-specific services, the overall outage may last up to several days. We will prioritize getting source code version control systems up first. This announcement is being sent to those main mailing lists that have been recently active; please feel free to share it. You are welcome to listen in on irc.freenode.net #overseers during the transition period. We appreciate your patience and hope that the new machines will serve us all well. - FChE </pre> Frank Ch. Eigler 2013-03-12T15:36:03 http://permalink.gmane.org/gmane.comp.debugging.archer/2546 <pre>Tom&gt; I will send mail when I am done. Ok, I have renamed all the branches and deleted the old ones. Please check my work. Tom&gt; The most important bit here is that, after updating and pruning, you Tom&gt; should be sure to edit your .git/config to ensure that the "merge" Tom&gt; property for branches you care about is correct. Also, please make sure to create a README.archer file in each of your branches. The point of this is to make it simpler to make branches -- no more editing the wiki. I plan to push a few new ones now... Tom </pre> Tom Tromey 2013-02-27T21:14:41 http://permalink.gmane.org/gmane.comp.debugging.archer/2545 <pre>Sergio&gt; The command is "git remote prune $remote". Whoops, thanks. I should have cut-and-pasted :) Tom </pre> Tom Tromey 2013-02-27T20:50:13 http://permalink.gmane.org/gmane.comp.debugging.archer/2544 <pre>Tom&gt; I'll wait until tomorrow to rename all the remaining branches. I'm going to start this now. Please refrain from pushing for the time being. I will send mail when I am done. The most important bit here is that, after updating and pruning, you should be sure to edit your .git/config to ensure that the "merge" property for branches you care about is correct. Tom </pre> Tom Tromey 2013-02-27T20:49:59 http://permalink.gmane.org/gmane.comp.debugging.archer/2543 <pre> Thanks, Tom. The command is "git remote prune $remote". </pre> Sergio Durigan Junior 2013-02-26T20:31:07 http://permalink.gmane.org/gmane.comp.debugging.archer/2542 <pre>Tom&gt; Next I'm going to rename some of my branches. I've done this now. I'll wait until tomorrow to rename all the remaining branches. If you fetch, you can "git prune remote $remote" ($remote usually is "origin" or "archer" for you...) to zap all the dead branches. Tom </pre> Tom Tromey 2013-02-26T20:13:42 http://permalink.gmane.org/gmane.comp.debugging.archer/2541 <pre>Tom&gt; I'll do the branch deletions next week or so, then the renames after Tom&gt; that. I've zapped all the dead branches now. Please check your branches to see whether any dead ones remain. Next I'm going to rename some of my branches. If that goes well, I plan to rename all the remaining branches as discussed, and then delete the old names. I will send email before doing this so you will know not to push during the renaming. After the renaming, please be sure to use the new names. thanks, Tom </pre> Tom Tromey 2013-02-26T17:33:31 http://permalink.gmane.org/gmane.comp.debugging.archer/2540 <pre> Tom&gt; Third, what about adopting a convention for a "README.archer" file in Tom&gt; the top-level of each branch? This file would explain the branch's Tom&gt; purpose and would let us bypass the tedious step of updating the wiki Tom&gt; whenever pushing a new branch. I've added this to a couple of my branches. You can see it in action with git show origin/archer-tromey-python-checker:README.archer I'd like everyone to add a file like this to their live branches. Don't bother with the dead branches, I'm going to zap them all soon. It is fine with me if you want to wait for the great branch renaming before doing this. thanks, Tom </pre> Tom Tromey 2013-02-22T21:27:24 http://permalink.gmane.org/gmane.comp.debugging.archer/2539 <pre>Jan&gt; But I find the 'cat' merge would be best for everyone, even for Jan&gt; other people occasionally possibly doing some archer branch merges. Tom&gt; I'll write this soon. The very simplest way to do this is to add this to your .git/config: [merge "archer"] name = README.archer merger driver = tee -a %A &lt; %B &gt; /dev/null Then make an attributes file like: echo "README.archer merge=archer" &gt;&gt; .git/info/attributes This is slightly ugly since it doesn't separate the various file contents at all. A slightly better option is to put this script on your PATH somewhere: #!/bin/sh # A git merge script for README.archer files. echo &gt;&gt; $1 echo ================================================================ &gt;&gt; $1 cat $2 &gt;&gt; $1 exit 0 Then change the config entry to point to it: [merge "archer"] name = README.archer merger driver = readme-archer %A %B This yields somewhat nicer output. I didn't see a particularly handy way for us to share this, aside from emailing scripts around. </pre> Tom Tromey 2013-02-22T15:54:05 http://permalink.gmane.org/gmane.comp.debugging.archer/2538 <pre>Tom&gt; I'm ok with changing this. Tom&gt; Anybody else have comments on it? Jan&gt; +1 Ok, I changed our git config in archer.git to: [receive] denyNonFastforwards = false Tom </pre> Tom Tromey 2013-02-22T15:06:20 http://permalink.gmane.org/gmane.comp.debugging.archer/2537 <pre>Jan&gt; But I find the 'cat' merge would be best for everyone, even for Jan&gt; other people occasionally possibly doing some archer branch merges. I'll write this soon. Tom </pre> Tom Tromey 2013-02-18T22:01:26 http://permalink.gmane.org/gmane.comp.debugging.archer/2536 <pre>Jan&gt; You must have some stale local copy. Both Jan&gt; http://sourceware.org/git/?p=archer.git;a=heads Jan&gt; and fresh Jan&gt; git clone git://sourceware.org/git/archer.git Jan&gt; do not show anything other then archer-* branches. I needed to run "git remote prune origin". I wasn't aware that this had to be done manually, oops. Tom </pre> Tom Tromey 2013-02-18T17:40:13 http://permalink.gmane.org/gmane.comp.debugging.archer/2535 <pre> You must have some stale local copy. Both http://sourceware.org/git/?p=archer.git;a=heads and fresh git clone git://sourceware.org/git/archer.git do not show anything other then archer-* branches. BTW gdb.git tags were left there, that could be fixed (but I do not use tags). Yes, that would be great. In fact it does not matter much as the additional work twice a year is very minor. But I find the 'cat' merge would be best for everyone, even for other people occasionally possibly doing some archer branch merges. Jan </pre> Jan Kratochvil 2013-02-18T17:03:02 http://permalink.gmane.org/gmane.comp.debugging.archer/2534 <pre>Jan&gt; I already did so, where do you see them? Jan&gt; archer.git "master" deletion (+branches cleanup) Jan&gt; Message-ID: &lt;20111226231836.GA32067-7nsVu6/LiMWEMjOnxBQzlezzdE9aetE+&lt; at &gt;public.gmane.org&gt; Jan&gt; http://sourceware.org/ml/archer/2011-q4/msg00010.html Jan&gt; http://sourceware.org/ml/archer/2012-q1/msg00001.html E.g., but there are really many more: barimba. git branch -r |grep origin/gdb origin/gdb-4_18-branch origin/gdb-csl-20060226-branch origin/gdb-csl-arm-20051020-branch origin/gdb-csl-available-20060303-branch origin/gdb-csl-gxxpro-6_3-branch origin/gdb-csl-symbian-20060226-branch origin/gdb-premipsmulti-2000-06-06-branch origin/gdb_5_0-2000-04-10-branch origin/gdb_5_1-2001-07-29-branch origin/gdb_5_1_0_1-2002-01-03-branch origin/gdb_5_2-branch origin/gdb_5_3-branch origin/gdb_6_0-branch origin/gdb_6_1-branch origin/gdb_6_2-branch origin/gdb_6_2-branch-UNNAMED-BRANCH origin/gdb_6_3-branch origin/gdb_6_4-branch origin/gdb_6_5-branch origin/gdb_6_6-branch orig</pre> Tom Tromey 2013-02-18T16:29:15 http://permalink.gmane.org/gmane.comp.debugging.archer/2533 <pre> I already did so, where do you see them? archer.git "master" deletion (+branches cleanup) Message-ID: &lt;20111226231836.GA32067-7nsVu6/LiMWEMjOnxBQzlezzdE9aetE+&lt; at &gt;public.gmane.org&gt; http://sourceware.org/ml/archer/2011-q4/msg00010.html http://sourceware.org/ml/archer/2012-q1/msg00001.html Those are two big pages with many solutions, which one do you mean? I quickly found there only dropping of the merged content; but in fact the list of merged branches would be exactly useful during the merging: Currently I track a separate file "IMPORT" generating the merged branches list there (currently only 2, there were many), this could be done automatically now, see the header of: http://pkgs.fedoraproject.org/cgit/gdb.git/tree/gdb-archer.patch The convenience depends on whether it is for branch author or for the merge maintainer. :-) Jan </pre> Jan Kratochvil 2013-02-18T16:19:49 http://permalink.gmane.org/gmane.comp.debugging.archer/2532 <pre>I'd like to propose changing how we manage our task list. Rather than have it on the wiki, I think we should file each task as a bug in bugzilla. We would add an "archer" tag to each task. Then, we could replace the current list on the wiki with a bugzilla query. I think this would be somewhat better since it would give us a way to track who is working on which archer task; and also let us more easily "accept" existing bugs into archer (by just adding the tag). This would also give us a built-in spot to discuss any particulars of a given task, and a simple way to indicate task dependencies (and even priorities if we care). Some of our tasks are a bit vague for a PR; but the vague ones aren't really tasks so much as long-term goals or wishes. Those could remain on the wiki. Any comments? Tom </pre> Tom Tromey 2013-02-18T16:19:23 http://permalink.gmane.org/gmane.comp.debugging.archer/2531 <pre> +1 I already have: git-push-f: #! /bin/bash set -ex branch="$(git branch|sed -n 's/^[*] \([^()]*\)$/\1/p')" test -n "$branch" git push origin ":$branch" git push origin "$branch" echo OK Jan </pre> Jan Kratochvil 2013-02-18T16:16:04 http://permalink.gmane.org/gmane.comp.debugging.archer/2530 <pre>Sergio&gt; I would like to propose another thing: the archer repository should Sergio&gt; accept "git push --force". It is annoying having to delete &amp; re-create Sergio&gt; the branch you're working on because you're using git-rebase to maintain Sergio&gt; a series of patches. Maybe we could talk to Jim about that? We can edit the git config file on sourceware ourselves. I'm ok with changing this. Anybody else have comments on it? Tom </pre> Tom Tromey 2013-02-18T16:11:13 http://permalink.gmane.org/gmane.comp.debugging.archer/2529 <pre>Tom&gt; I don't propose renaming existing branches. Jan&gt; IMO if there should be a different naming the existing should be renamed, Jan&gt; otherwise it is more complicated/mess than it was. It seems the consensus is to rename them. So, let's do that. Also I think we should delete all the branches that we got from gdb.git. There's no need for them in archer.git. I'll do the branch deletions next week or so, then the renames after that. Tom&gt; Third, what about adopting a convention for a "README.archer" file in Tom&gt; the top-level of each branch? Jan&gt; That would not work for merges of multiple branches. Some Jan&gt; ARCHER.branchname would work. Ok, it turns out that --edit-description doesn't really do what we'd like. Bummer. I found this that shows a way that we could make README.archer work without excessive merge issues: http://stackoverflow.com/questions/2108405/branch-descriptions-in-git http://stackoverflow.com/questions/928646/how-do-i-tell-git-to-always-select-my-local-version-for-conflicted-merges-o</pre> Tom Tromey 2013-02-18T16:10:22 http://permalink.gmane.org/gmane.comp.debugging.archer/2528 <pre> Agreed. Agreed. IMO it would be better to rename the existing branches so that we "start fresh", instead of leaving old stuff behind. Fine by me too. I'd prefer this rather than the README.archer file, but I couldn't find anything related (except the "--edit-description" option from git-branch, which apparently doesn't do exactly what you described, as pointed by others). I would like to propose another thing: the archer repository should accept "git push --force". It is annoying having to delete &amp; re-create the branch you're working on because you're using git-rebase to maintain a series of patches. Maybe we could talk to Jim about that? Thanks, </pre> Sergio Durigan Junior 2013-02-18T11:46:27 http://permalink.gmane.org/gmane.comp.debugging.archer/2527 <pre> Deleting dead branches would make this easier, of course. Cheers, Gary </pre> Gary Benson 2013-02-13T12:53:34 Search the mailing list at Gmane query http://search.gmane.org/?group=$group=gmane.comp.debugging.archer