[MacPorts] #51409: Git mirror for trunk is out of sync
#51409: Git mirror for trunk is out of sync -----------------------------+--------------------- Reporter: davide.liessi@… | Owner: admin@… Type: defect | Status: new Priority: High | Milestone: Component: server/hosting | Version: Keywords: | Port: -----------------------------+--------------------- The trunk Git mirror (git://git.macports.org/macports/trunk.git) is at r148499 while the SVN repository is at r148743. (High priority because it used to work and now it is broken.) -- Ticket URL: <https://trac.macports.org/ticket/51409> MacPorts <https://www.macports.org/> Ports system for OS X
#51409: Git mirror for trunk is out of sync ------------------------------+--------------------- Reporter: davide.liessi@… | Owner: admin@… Type: defect | Status: new Priority: Normal | Milestone: Component: server/hosting | Version: Resolution: | Keywords: Port: | ------------------------------+--------------------- Changes (by mf2k@…): * priority: High => Normal Comment: The Priority field is for use by Macports team members only who will determine the priority. -- Ticket URL: <https://trac.macports.org/ticket/51409#comment:1> MacPorts <https://www.macports.org/> Ports system for OS X
#51409: Git mirror for trunk is out of sync ------------------------------+--------------------- Reporter: davide.liessi@… | Owner: admin@… Type: defect | Status: new Priority: Normal | Milestone: Component: server/hosting | Version: Resolution: | Keywords: Port: | ------------------------------+--------------------- Comment (by davide.liessi@…): Sorry, I won't change it next time. I thought it was ok because of this: https://trac.macports.org/ticket/49488#comment:1 -- Ticket URL: <https://trac.macports.org/ticket/51409#comment:2> MacPorts <https://www.macports.org/> Ports system for OS X
#51409: Git mirror for trunk is out of sync ------------------------------+--------------------- Reporter: davide.liessi@… | Owner: admin@… Type: defect | Status: new Priority: High | Milestone: Component: server/hosting | Version: Resolution: | Keywords: Port: | ------------------------------+--------------------- Changes (by ryandesign@…): * priority: Normal => High Comment: I agree this can be high priority, but I don't know how to fix it. The post-commit hook is running, the git sync script is running, and the only unusual thing in the log is that git-svn crashed after importing this revision: {{{ M dports/net/libgweather/Portfile Couldn't find revmap for https://svn.macports.org/repository/macports/users/devans/GNOME-3/stable/dpo... r148499 = 35bcce39e997904756821b0afa1d8b0e6879bb27 (refs/remotes/trunk) error: git-svn died of signal 11 }}} -- Ticket URL: <https://trac.macports.org/ticket/51409#comment:3> MacPorts <https://www.macports.org/> Ports system for OS X
#51409: Git mirror for trunk is out of sync ------------------------------+--------------------- Reporter: davide.liessi@… | Owner: admin@… Type: defect | Status: new Priority: High | Milestone: Component: server/hosting | Version: Resolution: | Keywords: Port: | ------------------------------+--------------------- Comment (by dluke@…): some googling says that this is caused by git-svn being confused by svn:mergeinfo (so probably r148494). It looks like the git repo doesn't have the 'users' directory so it's failing because it can't find the parent for this merge (it's in part of the svn repo that isn't in the git repo). I don't know what the fix for that is, though (maybe a git or git-svn expert can chime in?) -- Ticket URL: <https://trac.macports.org/ticket/51409#comment:4> MacPorts <https://www.macports.org/> Ports system for OS X
#51409: Git mirror for trunk is out of sync ------------------------------+--------------------- Reporter: davide.liessi@… | Owner: admin@… Type: defect | Status: new Priority: High | Milestone: Component: server/hosting | Version: Resolution: | Keywords: Port: | ------------------------------+--------------------- Comment (by ryandesign@…): But this would hardly be the first time Dave has merged from his GNOME branch to trunk, and it hasn't caused this problem before. -- Ticket URL: <https://trac.macports.org/ticket/51409#comment:5> MacPorts <https://www.macports.org/> Ports system for OS X
#51409: Git mirror for trunk is out of sync ------------------------------+--------------------- Reporter: davide.liessi@… | Owner: admin@… Type: defect | Status: new Priority: High | Milestone: Component: server/hosting | Version: Resolution: | Keywords: Port: | ------------------------------+--------------------- Comment (by dluke@…): That's true, perhaps there's some # of missed lookups that triggers the crash (and before the crash it's OK to just ignore the warning because we don't care that the merge parent isn't recorded for this case)? It does look like git-svn uses a cache for merge lookups ($ENV{GIT_DIR}/svn/.caches/lookup_svn_merge) - it might be worth moving aside that file if it's there and seeing if that allows it to regen the cache and continue further. -- Ticket URL: <https://trac.macports.org/ticket/51409#comment:6> MacPorts <https://www.macports.org/> Ports system for OS X
#51409: Git mirror for trunk is out of sync ------------------------------+--------------------- Reporter: davide.liessi@… | Owner: admin@… Type: defect | Status: closed Priority: High | Milestone: Component: server/hosting | Version: Resolution: fixed | Keywords: Port: | ------------------------------+--------------------- Changes (by ryandesign@…): * status: new => closed * resolution: => fixed Comment: Thanks, I also found pages on Google suggesting moving aside the caches, since the name suggests they are merely caches which it should be possible for git to recreate from other data. I moved aside the .caches directory and reran the sync script which appears to have completed successfully and created a new .caches directory. I see that the lookup_svn_merge.db file in the new .caches directory is around 13K in size, while in the old .caches directory it was 0B. -- Ticket URL: <https://trac.macports.org/ticket/51409#comment:7> MacPorts <https://www.macports.org/> Ports system for OS X
participants (1)
-
MacPorts