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

From: Henning Sprang <henning.sprang@gmail.com>
Date: May 23, 2014, 10:14 UTC
Message-ID: <CAB10+LuaoCHYOew_=_NhF3m++owM9uuQqFvA79e1bTs=YpOCWQ@mail.gmail.com>
In-Reply-To: <CAEcj5uURgU0NfocwSxYDJiQvwdyvDgS3Gvo2kFEroz-dg=U5Tg@mail.gmail.com>

Hi Thomas,

On Wed, May 21, 2014 at 10:33 PM, Thomas Ferris Nicolaisen <tfnico@gmail.com> wrote:

Show 8 quoted lines

> 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.

Thanks for the explanation so far!

> 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.

OK, as you correctly assume, for this case it's pretty much fine, I was just thinking I'm doing something stupid, and wanted to learn how to do it correctly in case I'll have an actual use case where changes appear on both sides - but then again, maybe that should then also be avoided by a more reasonable versioning setup(e.g. throwing out SVN completely :) )

> Alternatively, you could consider some other mechanism for backup (rsync, etc).

I do anyway. I just love to have multiple backups in multiple locations and formats, just to see them all fail differently in a real emergency case :)

Cheers, Henning

-- 
Henning Sprang
http://www.sprang.de