www-infrastructure-issues mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Hari Shreedharan (JIRA)" <j...@apache.org>
Subject [jira] [Commented] (INFRA-5146) Accidental push of merge commits from a committer's local repo has changed history.
Date Wed, 15 Aug 2012 17:57:38 GMT

    [ https://issues.apache.org/jira/browse/INFRA-5146?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13435350#comment-13435350
] 

Hari Shreedharan commented on INFRA-5146:
-----------------------------------------

These are the commits :
5434b68 - Merge branch 'trunk' of git://git.apache.org/flume into new-trunk
25796ec - Merge branch 'trunk' of git://git.apache.org/flume into new-trunk
17ba20b - Merge branch 'trunk' of git://git.apache.org/flume into new-trunk
73e5364 - Merge branch 'trunk' of git://git.apache.org/flume into new-trunk
24f2d38 - Merge branch 'trunk' of git://git.apache.org/flume into new-trunk
154b206 - Merge branch 'trunk' of git://git.apache.org/flume into new-trunk

These commits, some of them weeks old (when created on the committer's local repo) were not
on trunk until yesterday and now appear in the history before newer commits. 
                
> Accidental push of merge commits from a committer's local repo has changed history.
> -----------------------------------------------------------------------------------
>
>                 Key: INFRA-5146
>                 URL: https://issues.apache.org/jira/browse/INFRA-5146
>             Project: Infrastructure
>          Issue Type: Bug
>      Security Level: public(Regular issues) 
>          Components: Git
>            Reporter: Hari Shreedharan
>         Attachments: INFRA-5146
>
>
> git-wip-us is not supposed to allow out of order commits to be pushed. A set of commits
previously not on trunk but dated before yesterday got pushed from a committer's local repo.
Examples of such commits:
> 154b206820b22af1e963170777889c2762ee8aec
> 24f2d3858da37b6f6823bf29fb1effd0f334d15a
> These commits are not in the log in a clone which I have not pulled since yesterday.


--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa
For more information on JIRA, see: http://www.atlassian.com/software/jira

        

Mime
View raw message