zookeeper-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Michael Han <h...@apache.org>
Subject Re: All tags and branches rebased before 3.5.2 ?
Date Tue, 12 Sep 2017 17:40:59 GMT
The tags themselves were not moved or force pushed as far as I can tell.
The problem is the every commit differs in terms of the commit hash between
the official ZooKeeper repo and the old repos (autodesk-forks and phunt).

I suspect it was the svn git move that causes this:
https://issues.apache.org/jira/browse/INFRA-12573. As part of the move, the
main branch of our repo was renamed from "trunk" to "master". From what I
know, git generates commit hash based on a couple of parameters including
the source tree of the commit, and maybe the renaming of the branch here
changed the state of the source tree that leads to the rewriting of the
entire commit hash history (but not the commit contents, as they were
intact.).

I think a reasonable next step is to confirm with someone in INFRA about
this while waiting for more inputs from this group.

On Tue, Sep 12, 2017 at 9:23 AM, Patrick Hunt <phunt@apache.org> wrote:

> The tags differ between old clones and recent ones.
>
> https://git-wip-us.apache.org/repos/asf/zookeeper.git
> git@github.com:apache/zookeeper.git
> git://git.apache.org/zookeeper.git
>
> are all consistent (tags) as are
>
> https://github.com/autodesk-forks/zookeeper.git
> https://github.com/phunt/zookeeper.git (my old repo)
>
> I checked out a few tags from lars repo as well as apache latest, while the
> tags differ the content does not.
>
> Using gitk I see that the two sets of repos differ at
> commit 11d2d6fd92acf9abc762c41e0f7b91c5acc89f4f
>
> I'm not sure why (have to run to a meeting...)
>
> Patrick
>
>
> On Tue, Sep 12, 2017 at 7:46 AM, Patrick Hunt <phunt@apache.org> wrote:
>
> > Hm.. I do see a relatively recent force push: http://markmail.org/
> > message/n3ho5n7eb6uvfacs and associated jira https://issues.apache.
> > org/jira/browse/INFRA-13916
> >
> > Michael?
> >
> > Patrick
> >
> > On Tue, Sep 12, 2017 at 7:31 AM, Patrick Hunt <phunt@apache.org> wrote:
> >
> >> I haven't had a chance to look into this, could be serious - does anyone
> >> know if this was related to the move from SVN?
> >>
> >> Patrick
> >>
> >> On Mon, Sep 11, 2017 at 10:29 AM, Lars Schneider <
> >> larsxschneider@gmail.com> wrote:
> >>
> >>> Hi,
> >>>
> >>> I fetched changes from git://git.apache.org/zookeeper.git and noticed
> >>> that almost all released tags changed.
> >>> E.g. my "release-3.5.2" is at 379eb9c and the upstream "release-3.5.2"
> >>> 3f572f0.
> >>>
> >>> There is no difference between the tags:
> >>> $ git diff 379eb9c..3f572f0 | wc -l
> >>> 0
> >>>
> >>> I am reasonably sure that I did not change those tags.
> >>> Do you know what happened? I wasn't able to find anything about this in
> >>> the mailing list archive.
> >>>
> >>> Thanks,
> >>> Lars
> >>>
> >>>
> >>> Here is the full list of different tags:
> >>>
> >>> 0.0.1
> >>> 2.1.0
> >>> apache-initial-import
> >>> post_ZOOKEEPER-45_snapshot
> >>> release-3.0.0
> >>> release-3.0.1
> >>> release-3.0.1-rc0
> >>> release-3.1.0
> >>> release-3.1.0-rc0
> >>> release-3.1.0-rc1
> >>> release-3.1.0-rc2
> >>> release-3.1.1
> >>> release-3.1.1-rc0
> >>> release-3.1.2
> >>> release-3.1.2-rc0
> >>> release-3.2.0
> >>> release-3.2.0-rc0
> >>> release-3.2.1
> >>> release-3.2.2
> >>> release-3.2.2-rc0
> >>> release-3.3.0
> >>> release-3.3.1
> >>> release-3.3.2
> >>> release-3.3.3
> >>> release-3.3.3-rc0
> >>> release-3.3.3-rc1
> >>> release-3.3.4
> >>> release-3.3.4-rc0
> >>> release-3.3.5
> >>> release-3.3.5-rc0
> >>> release-3.3.5-rc1
> >>> release-3.3.6
> >>> release-3.3.6-rc0
> >>> release-3.4.0
> >>> release-3.4.0-rc0
> >>> release-3.4.0-rc1
> >>> release-3.4.0-rc2
> >>> release-3.4.1
> >>> release-3.4.1-rc0
> >>> release-3.4.2
> >>> release-3.4.2-rc0
> >>> release-3.4.3
> >>> release-3.4.3-rc0
> >>> release-3.4.4
> >>> release-3.4.4-rc0
> >>> release-3.4.5
> >>> release-3.4.5-rc0
> >>> release-3.4.5-rc1
> >>> release-3.4.6
> >>> release-3.4.6-rc0
> >>> release-3.4.7
> >>> release-3.4.7-rc0
> >>> release-3.4.8
> >>> release-3.4.8-rc0
> >>> release-3.4.9-rc0
> >>> release-3.4.9-rc1
> >>> release-3.4.9-rc2
> >>> release-3.5.0
> >>> release-3.5.0-rc0
> >>> release-3.5.1
> >>> release-3.5.1-rc0
> >>> release-3.5.1-rc1
> >>> release-3.5.1-rc2
> >>> release-3.5.1-rc3
> >>> release-3.5.1-rc4
> >>> release-3.5.2
> >>> release-3.5.2-rc0
> >>> release-3.5.2-rc1
> >>
> >>
> >>
> >
>

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message