www-infrastructure-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Joe Schaefer <joe_schae...@yahoo.com>
Subject Re: [1/2] git commit: f92a685 -
Date Tue, 05 Jun 2012 18:51:53 GMT
Merge commits do peculiar things- part of what happened
is that I committed my change locally first, then pulled
to sync up with the central repo, then pushed back.  Somehow
history gets reordered and that is supposed to be reflected
in these merge commit notices.



----- Original Message -----
> From: Greg Stein <gstein@gmail.com>
> To: infrastructure-dev@apache.org
> Cc: joes@apache.org; Sam Ruby <rubys@apache.org>
> Sent: Tuesday, June 5, 2012 2:47 PM
> Subject: Re: [1/2] git commit: f92a685 -
> 
>T he commit notices on Joe's and Sam's merges seem to be screwy.
> 
> At the bottom, it shows the diff breakdown graph, but that is not the
> auth.cfg change that Joe actually made (804f6ab). In fact... the diff
> breakdown for auth.cfg doesn't show up until Sam's merge (which is
> supposed to show a web page update).
> 
> The Parents seem to be fine. It is merely the diff graph that appears wrong.
> 
> Cheers,
> -g
> (not subscribed to infra-dev)
> 
> On Tue, Jun 5, 2012 at 1:53 PM,  <joes@apache.org> wrote:
>>  Updated Branches:
>>   refs/heads/master bee695d44 -> f92a6853b
>> 
>> 
>>  Merge branch 'master' of 
> https://git-wip-us.apache.org/repos/infra/asfgit-admin
>> 
>> 
>>  Project: https://git-wip-us.apache.org/repos/infra/asfgit-admin/repo
>>  Commit: 
> https://git-wip-us.apache.org/repos/infra/asfgit-admin/commit/f92a6853
>>  Tree: https://git-wip-us.apache.org/repos/infra/asfgit-admin/tree/f92a6853
>>  Diff: https://git-wip-us.apache.org/repos/infra/asfgit-admin/diff/f92a6853
>> 
>>  Branch: refs/heads/master
>>  Commit: f92a6853beb7a52bd73d81f96a90cf34c3d4b2e2
>>  Parents: 804f6ab bee695d
>>  Author: Joe Schaefer <joes@apache.org>
>>  Authored: Tue Jun 5 13:53:41 2012 -0400
>>  Committer: Joe Schaefer <joes@apache.org>
>>  Committed: Tue Jun 5 13:53:41 2012 -0400
>> 
>>  ----------------------------------------------------------------------
>>   conf/httpd/git.conf                    |   37 +++++++++++++++++++++++++++
>>   conf/httpd/httpd.conf                  |    1 +
>>   site/htdocs/docs/common-errors.html    |   12 ++++----
>>   site/htdocs/docs/switching-to-git.html |   12 ++++----
>>   site/htdocs/docs/workflow.html         |   12 ++++----
>>   site/htdocs/index.html                 |   12 ++++----
>>   site/templates/base.html               |   12 ++++----
>>   7 files changed, 68 insertions(+), 30 deletions(-)
>>  ----------------------------------------------------------------------
>> 
>> 
> 

Mime
View raw message