git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: git push rejected due being behind after git svn dcommit without any changes local/remote

From
Thomas Ferris Nicolaisen <tfnico@gmail.com>
Date
May 21, 2014, 21:33 UTC
Message-ID
<CAEcj5uURgU0NfocwSxYDJiQvwdyvDgS3Gvo2kFEroz-dg=U5Tg@mail.gmail.com>
In-Reply-To
<CAB10+LtnAiCCiMdrULvioxc-UBQufKD4AzOphvE8bAdq7en04g@mail.gmail.com>

On Wed, May 21, 2014 at 6:13 PM, Henning Sprang <henning.sprang@gmail.com> wrote:

Show 8 quoted lines
>
> You'd say, can happen, when some developers work against the remote
> git repo, others with svn. But I'm the only developer on the project,
> and no one ever commits to the remote svn nor the remote git repo. So,
> I'm clueless.
>
> How can I find out what happens and how to prevent that?
>

This is normal. Every time you update or sync against the SVN server, your local history is rewritten if you have local commits: All your local commits are rebased on top of the latest changes coming from SVN.

If you want to avoid this, only push to your Git mirror when your git-svn clone and the SVN repo are in sync. Doing so ruins the whole point of your Git mirror, I assume.

So, I'm afraid you have to get used to just force-pushing to your Git mirror. Even though this is not considered good practice, it should be fine as long as you are the only one using this mirror.

Alternatively, you could consider some other mechanism for backup (rsync, etc).
Previous: Henning SprangNext: Henning Sprang
Message 2 of 3 in “git push rejected due being behind after git svn dcommit without any changes local/remote”
  1. Henning SprangMay 21, 2014
  2. Thomas Ferris NicolaisenMay 21, 2014
  3. Henning SprangMay 23, 2014

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.