'braid push' leads to 'patch failed' on Windows about braid HOT 10 CLOSED

As it turned out using --ignore-space-change --ignore-whitespace seems to mash up line endings, too.
Could it be an issue with having autocrlf = false?

from braid.

I think I've tracked it down to be caused by git always generating patches with ln line endings.
Any hint on how to solve this without setting autocrlf to true?

from braid.

Unfortunately I have no real solution for this.

We have been forced recently make all of our developers use autocrlf = false, explicitly set EOL style in .gitattributes and then explicitly check EOLs as a build step :( It sucks but I am not sure what the solution is.

from braid.

Next time I work on Braid I will try to display the full error messages

from braid.

We have been forced recently make all of our developers use autocrlf = false, explicitly set EOL style in .gitattributes and then explicitly check EOLs as a build step :( It sucks but I am not sure what the solution is.

After reading a lot about git and line endings I came to the same conclusion (:. Anyway, thanks for your confirmation. I'll go with a .gitattributes file.

Next time I work on Braid I will try to display the full error messages

Nice, thanks!

from braid.

This sounds like the kind of problem I was hoping to avoid by changing braid push to use a direct three-way tree merge instead of going through a patch file.

Edit: braid push always generates a commit starting from the mirror's base revision, so we can just replace the tree or subtree instead of doing a merge. (Before pushing, Braid attempts to check that the mirror's base revision is up to date with upstream, though IIRC there might be edge cases in which this check falsely passes.)

from braid.

@0x084E: I'd be curious if #60 fixes the problem you saw.

from braid.

@mattmccutchen I've tried your pull request but I can't get it to work. I'm getting the following errors:

Braid: Shell error: error: object directory C:/tmp/braid-test/Repo1/.git/objects? does not exist; check .git/objects/info/alternates.
error: object directory C:/Users/User/.braid/cache/C__tmp_braid-test_Repo2/objects? does not exist; check .git/objects/info/alternates.
fatal: failed to unpack tree object ceb1001f34e43c649c47ce3ef136d0745be0259e

from braid.

@0x084E: Oops. I guess I need to actually set up a development environment on Windows so I can try this for myself. Looks like the problem is just that the alternates file needs to use LF, not CRLF, even on Windows. How about #61?

from braid.

Confirmed, in version 1.0.20 the problem is solved. Thanks to everyone involved!

from braid.