[Bug 666539] errors from git hook

  sysadmin | Git | unspecified

--- Comment #2 from Christian Persch <chpe gnome org> 2012-03-29 15:54:18 UTC ---
(In reply to comment #1)
> Not sure the exact history here, but the problem is that the guile-2.0 branch
> contains a parent-less commit not in master:
>  commit 219c7ce6c4e1baa45df98d0d2e41a8e145f38369
> Author: (no author) <(no author)@6d1c95cb-ea25-0410-963c-d72b9ec7b530>
> Date:   Thu Jun 12 22:30:51 2003 +0000
>     New repository initialized by cvs2svn.
>     git-svn-id: svn+ssh://svn.gnome.org/svn/drgeo/trunk@1
> 6d1c95cb-ea25-0410-963c-d72b9ec7b530
> It looks like maybe the branch originated from some different source other than
> GNOME Git and then the master branch was merged in.

It did, yes. I had done this one a git-svn clone of drgeo from before gnome
switched to git, and trying to rebase the branch on top of the drgeo git module
didn't work, for whatever reasons. So I added my git-svn import as a remote and
merged it. I guess that messed stuff up :-)

Configure bugmail: https://bugzilla.gnome.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are watching the QA contact of the bug.
You are watching the assignee of the bug.

[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]