You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
The Working on Windows section of the docs explains the (current) pitfalls of creating a colocated repo on Windows due to the missing support for .gitattributes. While the docs explain how to recover the situation, they can lead to potential data loss if the user has untracked (but not gitignored) files in the working copy of the git repo. The docs suggest using jj abandon after setting git's core.autocrlf to input. However this would result in "losing" all those untracked files. They can still be recovered by using jj undo, but the docs do not mention that (and after using jj undo the user would be back on square one).
Until .gitattributes support is added, I'd suggest improving the documentation. I think it should suggest changing git's core.autocrlf to inputbefore creating the colocated jujutsu repo. It should also explain what to do in in case the user has any untracked but not gitignored files laying around when creating a the colocated repo. Probably the docs should mention jj config set --user snapshot.auto-track "none()" and remind users that jj undo exists just in case something still goes wrong.
Personally, I think this issue is a good example and a good argument in favor of changing the default snapshot.auto-track from all() to none() as suggested by #323.
Specifications
Platform: Windows
Version: 0.24.0
The text was updated successfully, but these errors were encountered:
I think improving the documentation should be no problem.
Probably the docs should mention jj config set --user snapshot.auto-track "none()" and remind users that jj undo exists just in case something still goes wrong.
Personally, I think this issue is a good example and a good argument in favor of changing the default snapshot.auto-track from all() to none() as suggested by #323.
This part I personally disagree with though, as auto-tracking is a good feature. Something actionable would be to print "Set snapshot.auto-track = none to preserve Git-like behavior." after co-locating, leaving the choice to the user.
Description
The Working on Windows section of the docs explains the (current) pitfalls of creating a colocated repo on Windows due to the missing support for
.gitattributes
. While the docs explain how to recover the situation, they can lead to potential data loss if the user has untracked (but not gitignored) files in the working copy of the git repo. The docs suggest usingjj abandon
after setting git'score.autocrlf
toinput
. However this would result in "losing" all those untracked files. They can still be recovered by usingjj undo
, but the docs do not mention that (and after usingjj undo
the user would be back on square one).Until
.gitattributes
support is added, I'd suggest improving the documentation. I think it should suggest changing git'score.autocrlf
toinput
before creating the colocated jujutsu repo. It should also explain what to do in in case the user has any untracked but not gitignored files laying around when creating a the colocated repo. Probably the docs should mentionjj config set --user snapshot.auto-track "none()"
and remind users thatjj undo
exists just in case something still goes wrong.Personally, I think this issue is a good example and a good argument in favor of changing the default
snapshot.auto-track
fromall()
tonone()
as suggested by #323.Specifications
The text was updated successfully, but these errors were encountered: