Re: Cannot push anything via export transport helper after push fails.

2014-04-12 Thread Felipe Contreras
Felipe Contreras wrote: On Sat, May 11, 2013 at 7:29 AM, Andrey Borzenkov arvidj...@gmail.com wrote: I noticed that using git-remote-bzr, but as far as I can tell this is generic for all transport helpers using fast-export. What happened was git push failed due to merge conflict. So

Re: Cannot push anything via export transport helper after push fails.

2014-04-12 Thread Felipe Contreras
Andrey Borzenkov wrote: В Sat, 11 May 2013 08:57:14 -0500 Felipe Contreras felipe.contre...@gmail.com пишет: On Sat, May 11, 2013 at 7:29 AM, Andrey Borzenkov arvidj...@gmail.com wrote: I noticed that using git-remote-bzr, but as far as I can tell this is generic for all transport

Re: Cannot push anything via export transport helper after push fails.

2013-05-16 Thread Andrey Borzenkov
В Sat, 11 May 2013 08:57:14 -0500 Felipe Contreras felipe.contre...@gmail.com пишет: On Sat, May 11, 2013 at 7:29 AM, Andrey Borzenkov arvidj...@gmail.com wrote: I noticed that using git-remote-bzr, but as far as I can tell this is generic for all transport helpers using fast-export.

Re: Cannot push anything via export transport helper after push fails.

2013-05-11 Thread John Keeping
On Sat, May 11, 2013 at 04:29:36PM +0400, Andrey Borzenkov wrote: I noticed that using git-remote-bzr, but as far as I can tell this is generic for all transport helpers using fast-export. What happened was git push failed due to merge conflict. So far so good - but from now on git

Re: Cannot push anything via export transport helper after push fails.

2013-05-11 Thread Andrey Borzenkov
В Sat, 11 May 2013 13:36:26 +0100 John Keeping j...@keeping.me.uk пишет: On Sat, May 11, 2013 at 04:29:36PM +0400, Andrey Borzenkov wrote: I noticed that using git-remote-bzr, but as far as I can tell this is generic for all transport helpers using fast-export. What happened was

Re: Cannot push anything via export transport helper after push fails.

2013-05-11 Thread Felipe Contreras
On Sat, May 11, 2013 at 7:29 AM, Andrey Borzenkov arvidj...@gmail.com wrote: I noticed that using git-remote-bzr, but as far as I can tell this is generic for all transport helpers using fast-export. What happened was git push failed due to merge conflict. So far so good - but from now on

Re: Cannot push anything via export transport helper after push fails.

2013-05-11 Thread Andrey Borzenkov
В Sat, 11 May 2013 08:57:14 -0500 Felipe Contreras felipe.contre...@gmail.com пишет: The problem seems to be that git fast-export updates marks unconditionally, whether export actually applied or not. So next time it assumes everything is already exported and does nothing. Is it

Re: Cannot push anything via export transport helper after push fails.

2013-05-11 Thread Felipe Contreras
On Sat, May 11, 2013 at 1:48 PM, Andrey Borzenkov arvidj...@gmail.com wrote: В Sat, 11 May 2013 08:57:14 -0500 Felipe Contreras felipe.contre...@gmail.com пишет: The problem seems to be that git fast-export updates marks unconditionally, whether export actually applied or not. So next