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 assumes everything is up to date. > > bor@opensuse:/tmp/test/git> git push origin master > To bzr::bzr+ssh://bor@localhost/tmp/test/bzr > ! [rejected] master -> master (non-fast-forward) > error: failed to push some refs to 'bzr::bzr+ssh://bor@localhost/tmp/test/bzr' > hint: Updates were rejected because the tip of your current branch is behind > hint: its remote counterpart. Merge the remote changes (e.g. 'git pull') > hint: before pushing again. > hint: See the 'Note about fast-forwards' in 'git push --help' for details. > bor@opensuse:/tmp/test/git> git push origin master > Everything up-to-date > bor@opensuse:/tmp/test/git> > > 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 expected behavior? What version of Git are you using? This sounds similar to the regression fixed by commit 126aac5 (transport-helper: fix remote helper namespace regression, 2013-05-10) but that was only introduced in commit 664059f (transport-helper: update remote helper namespace, 2013-04-17) which isn't in any released versions of Git. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html