[Bug 6638] New: new dirtstate loose files

mercurial-bugs at mercurial-scm.org mercurial-bugs at mercurial-scm.org
Wed Jan 26 05:12:50 UTC 2022


https://bz.mercurial-scm.org/show_bug.cgi?id=6638

            Bug ID: 6638
           Summary: new dirtstate loose files
           Product: Mercurial
           Version: 6.0rc0
          Hardware: PC
                OS: Windows
            Status: UNCONFIRMED
          Severity: feature
          Priority: wish
         Component: mq
          Assignee: bugzilla at mercurial-scm.org
          Reporter: alexraynepe196 at gmail.com
                CC: mercurial-devel at mercurial-scm.org
    Python Version: ---

try push patch over repo make by hg v5.9. 
got fail since dirstate loose some of it's file:

```
C:\lazarus>hg qpush --debug --traceback
(working directory not at a head)
applying debug-contol
patching file lcl/include/control.inc
Hunk #1 succeeded at 710 (offset 36 lines).
Hunk #2 succeeded at 3073 (offset 46 lines).
Hunk #3 succeeded at 3091 (offset 46 lines).
Hunk #4 succeeded at 3118 (offset 46 lines).
Hunk #5 succeeded at 3827 (offset 46 lines).
Hunk #6 succeeded at 4057 (offset 46 lines).
Hunk #7 succeeded at 4090 (offset 46 lines).
cannot patch lcl/include/control.inc: file is not tracked
Traceback (most recent call last):
  File "C:\Python38\lib\site-packages\hgext\mq.py", line 964, in patch
    fuzz = patchmod.patch(
  File "C:\Python38\lib\site-packages\mercurial\patch.py", line 2455, in patch
    return internalpatch(
  File "C:\Python38\lib\site-packages\mercurial\patch.py", line 2417, in
internalpatch
    return patchbackend(ui, backend, patchobj, strip, prefix, files, eolmode)
  File "C:\Python38\lib\site-packages\mercurial\patch.py", line 2391, in
patchbackend
    ret = applydiff(
  File "C:\Python38\lib\site-packages\mercurial\patch.py", line 2210, in
applydiff
    return _applydiff(
  File "C:\Python38\lib\site-packages\mercurial\patch.py", line 2251, in
_applydiff
    rejects += current_file.close()
  File "C:\Python38\lib\site-packages\mercurial\patch.py", line 905, in close
    self.writelines(self.fname, self.lines, self.mode)
  File "C:\Python38\lib\site-packages\mercurial\patch.py", line 754, in
writelines
    self.backend.setfile(fname, b''.join(lines), mode, self.copysource)
  File "C:\Python38\lib\site-packages\mercurial\patch.py", line 559, in setfile
    self._checkknown(fname)
  File "C:\Python38\lib\site-packages\mercurial\patch.py", line 556, in
_checkknown
    raise PatchError(_(b'cannot patch %s: file is not tracked') % fname)
mercurial.error.PatchError: b'cannot patch lcl/include/control.inc: file is not
tracked'
reusing manifest from p1 (no file change)
committing changelog
patch failed, rejects left in working directory
truncating cache/rbc-revs-v1 to 532952
updating the branch cache
errors during apply, please fix and qrefresh debug-contol
```

actualy `lcl/include/control.inc` - presents in history and wc well.

-- 
You are receiving this mail because:
You are on the CC list for the bug.


More information about the Mercurial-devel mailing list