From: Christophe R. <cs...@ca...> - 2011-06-09 13:03:46
|
"Jim Wise" <ji...@us...> writes: > The branch "master" has been updated in SBCL: > discards 4084b6b95c1d5e0a45e073a9b875d8471efd8505 (commit) > discards 9ca5f2d431133c37793fff74e1ecbd229574222d (commit) > discards 26627f70af3ede3610e4092175965e0250456a4d (commit) > discards 8573e16b201126d55dcfa6835ead4da061d4c71f (commit) > discards 69fe69971242dba6905e9c55f8ce6a9a93c9e403 (commit) > discards 6372f52f1077cd66c71a65c19740eabb66f25e03 (commit) Uh... this doesn't look quite right? Cheers, Christophe |
From: Jim W. <jw...@dr...> - 2011-06-09 13:05:33
|
Christophe Rhodes <cs...@ca...> writes: > "Jim Wise" <ji...@us...> writes: > >> The branch "master" has been updated in SBCL: >> discards 4084b6b95c1d5e0a45e073a9b875d8471efd8505 (commit) >> discards 9ca5f2d431133c37793fff74e1ecbd229574222d (commit) >> discards 26627f70af3ede3610e4092175965e0250456a4d (commit) >> discards 8573e16b201126d55dcfa6835ead4da061d4c71f (commit) >> discards 69fe69971242dba6905e9c55f8ce6a9a93c9e403 (commit) >> discards 6372f52f1077cd66c71a65c19740eabb66f25e03 (commit) > > Uh... this doesn't look quite right? Yeah, I'm not sure what happened here -- just mailed in response to the commit message, but forgot to add -devel. I had written: Any idea what this is about? I did a commit, a pull to make sure I was current, and a push. I haven't seen these on past commits, fwiw... -- Jim Wise jw...@dr... |
From: Nikodemus S. <nik...@ra...> - 2011-06-09 13:42:19
|
On 9 June 2011 16:05, Jim Wise <jw...@dr...> wrote: >>> The branch "master" has been updated in SBCL: >>> discards 4084b6b95c1d5e0a45e073a9b875d8471efd8505 (commit) >>> discards 9ca5f2d431133c37793fff74e1ecbd229574222d (commit) >>> discards 26627f70af3ede3610e4092175965e0250456a4d (commit) >>> discards 8573e16b201126d55dcfa6835ead4da061d4c71f (commit) >>> discards 69fe69971242dba6905e9c55f8ce6a9a93c9e403 (commit) >>> discards 6372f52f1077cd66c71a65c19740eabb66f25e03 (commit) >> >> Uh... this doesn't look quite right? > > Yeah, I'm not sure what happened here -- just mailed in response to the > commit message, but forgot to add -devel. I had written: > > Any idea what this is about? I did a commit, a pull to make sure I was > current, and a push. I haven't seen these on past commits, fwiw... Argh. This is a bug in my changes to the post-receive-email hook script. Nothing was discarded, but the script thinks so due to my changes. Specifically, when it sends out one email per commit (as opposed to one per push as the original), it doesn't get merge commits right. I'll see to it -- and if it proves troublesome, I'll revert to one email per push. Cheers, -- nikodemus |
From: Jim W. <jw...@dr...> - 2011-06-09 13:07:44
|
Jim Wise <jw...@dr...> writes: > Christophe Rhodes <cs...@ca...> writes: > >> "Jim Wise" <ji...@us...> writes: >> >>> The branch "master" has been updated in SBCL: >>> discards 4084b6b95c1d5e0a45e073a9b875d8471efd8505 (commit) >>> discards 9ca5f2d431133c37793fff74e1ecbd229574222d (commit) >>> discards 26627f70af3ede3610e4092175965e0250456a4d (commit) >>> discards 8573e16b201126d55dcfa6835ead4da061d4c71f (commit) >>> discards 69fe69971242dba6905e9c55f8ce6a9a93c9e403 (commit) >>> discards 6372f52f1077cd66c71a65c19740eabb66f25e03 (commit) >> >> Uh... this doesn't look quite right? > > Yeah, I'm not sure what happened here -- just mailed in response to the > commit message, but forgot to add -devel. I had written: > > Any idea what this is about? I did a commit, a pull to make sure I was > current, and a push. I haven't seen these on past commits, fwiw... And to be clear, the only file I had committed was generate-version.sh. -- Jim Wise jw...@dr... |
From: Jim W. <jw...@dr...> - 2011-06-09 13:39:14
|
Jim Wise <jw...@dr...> writes: > Jim Wise <jw...@dr...> writes: > >> Christophe Rhodes <cs...@ca...> writes: >> >>> "Jim Wise" <ji...@us...> writes: >>> >>>> The branch "master" has been updated in SBCL: >>>> discards 4084b6b95c1d5e0a45e073a9b875d8471efd8505 (commit) >>>> discards 9ca5f2d431133c37793fff74e1ecbd229574222d (commit) >>>> discards 26627f70af3ede3610e4092175965e0250456a4d (commit) >>>> discards 8573e16b201126d55dcfa6835ead4da061d4c71f (commit) >>>> discards 69fe69971242dba6905e9c55f8ce6a9a93c9e403 (commit) >>>> discards 6372f52f1077cd66c71a65c19740eabb66f25e03 (commit) >>> >>> Uh... this doesn't look quite right? >> >> Yeah, I'm not sure what happened here -- just mailed in response to the >> commit message, but forgot to add -devel. I had written: >> >> Any idea what this is about? I did a commit, a pull to make sure I was >> current, and a push. I haven't seen these on past commits, fwiw... > > And to be clear, the only file I had committed was generate-version.sh. I went through and checked, and the changes from all of the above commits are still present in a fresh clone from sourceforge -- but I'm still not sure what the above means. I haven't seen this before with our git implementation or other projects. Either way, sorry for the above, -- Jim Wise jw...@dr... |
From: Nikodemus S. <nik...@ra...> - 2011-06-09 15:04:05
|
On 9 June 2011 16:38, Jim Wise <jw...@dr...> wrote: > I went through and checked, and the changes from all of the above > commits are still present in a fresh clone from sourceforge -- but I'm > still not sure what the above means. I haven't seen this before with > our git implementation or other projects. > > Either way, sorry for the above, This was mainly my fault. The post-receive-email script tries to send one email per commit, but didn't deal with merge commits at all. False alarm. I've fixed it now, and after a quick discussion on #lisp I also added an update hook that prevents pushing merges onto master (checking all commits in a push.) If there's a time when someone needs to merge a clean long-lived branch onto master, we can turn it off for the duration or something. To avoid generating unnecessary merge commits, do git pull --rebase when you have local changes. Cheers, -- nikodemus |
From: Jim W. <jw...@dr...> - 2011-06-09 15:13:20
|
Nikodemus Siivola <nik...@ra...> writes: > This was mainly my fault. > > The post-receive-email script tries to send one email per commit, but > didn't deal with merge commits at all. False alarm. > > I've fixed it now, and after a quick discussion on #lisp I also added > an update hook that prevents pushing merges onto master (checking all > commits in a push.) > > If there's a time when someone needs to merge a clean long-lived > branch onto master, we can turn it off for the duration or something. > > To avoid generating unnecessary merge commits, do > > git pull --rebase > > when you have local changes. Aha -- thanks for this, I'll do a rebase before committing from here, as this is a tree which has outstanding but not-ready-for-primetime changes in it. -- Jim Wise jw...@dr... |