Download raw body.
rebase suffers '?' conflicts
Stefan Sperling: > > There is another oddity. After aborting the rebase, there are > > now modified file modes: > > > > got co src.git > > cd src > > got br tmp > > got br -c jca/llvm15-12 llvm15 > > got up -b tmp > > got rb llvm15 > > got rb -a > > got st > > Seems like these files have an x-bit set in src.git and lose it > after rebase -a, right? Yes. rebase -a restores the worktree such that the files regain the x bit, but somehow this is now treated as an uncommitted change, even though it agrees with what's in the repository. $ got up -b master ... $ got st m gnu/llvm/clang/include/clang/AST/DeclTemplate.h m gnu/llvm/clang/lib/AST/DeclTemplate.cpp m gnu/llvm/clang/lib/Sema/SemaConcept.cpp m gnu/llvm/clang/lib/Sema/SemaTemplate.cpp m gnu/llvm/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp m gnu/llvm/clang/utils/analyzer/CmpRuns.py m gnu/llvm/clang/utils/analyzer/SATestBuild.py $ ls -l gnu/llvm/clang/utils/analyzer total 312 -rwxr-xr-x 1 naddy naddy 20831 Apr 13 00:29 CmpRuns.py* -rw-r--r-- 1 naddy naddy 1705 Apr 13 00:29 Dockerfile -rw-r--r-- 1 naddy naddy 6828 Apr 13 00:03 ProjectMap.py -rwxr-xr-x 1 naddy naddy 15238 Apr 13 00:29 SATest.py* -rwxr-xr-x 1 naddy naddy 4098 Apr 13 00:30 SATestAdd.py* -rw-r--r-- 1 naddy naddy 5219 Apr 13 00:03 SATestBenchmark.py -rwxr-xr-x 1 naddy naddy 31972 Apr 13 00:29 SATestBuild.py* -rwxr-xr-x 1 naddy naddy 2213 Apr 13 00:30 SATestUpdateDiffs.py* -rw-r--r-- 1 naddy naddy 4901 Apr 13 00:03 SATestUtils.py -rw-r--r-- 1 naddy naddy 2840 Apr 13 00:03 SumTimerInfo.py -rw-r--r-- 1 naddy naddy 1789 Apr 13 00:29 entrypoint.py -rwxr-xr-x 1 naddy naddy 40309 Apr 13 00:29 exploded-graph-rewriter.py* drwxr-xr-x 22 naddy naddy 512 Apr 13 00:03 projects/ -rwxr-xr-x 1 naddy naddy 1655 Apr 13 00:03 reducer.pl* -rw-r--r-- 1 naddy naddy 51 Apr 13 00:03 requirements.txt -rwxr-xr-x 1 naddy naddy 1225 Apr 13 00:03 update_plist_test.pl* $ got tree -c master gnu/llvm/clang/utils/analyzer .dockerignore CmpRuns.py* Dockerfile ProjectMap.py SATest.py* SATestAdd.py* SATestBenchmark.py SATestBuild.py* SATestUpdateDiffs.py* SATestUtils.py SumTimerInfo.py entrypoint.py exploded-graph-rewriter.py* projects/ reducer.pl* requirements.txt update_plist_test.pl* -- Christian "naddy" Weisgerber naddy@mips.inka.de
rebase suffers '?' conflicts