[Bug 6316] New: censor extention can`t erase files behind subrepo

mercurial-bugs at mercurial-scm.org mercurial-bugs at mercurial-scm.org
Tue May 5 05:46:12 UTC 2020


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

            Bug ID: 6316
           Summary: censor extention can`t erase files behind subrepo
           Product: Mercurial
           Version: 5.4rc0
          Hardware: PC
                OS: All
            Status: UNCONFIRMED
          Severity: bug
          Priority: wish
         Component: censor
          Assignee: bugzilla at mercurial-scm.org
          Reporter: alexraynepe196 at gmail.com
                CC: mercurial-devel at mercurial-scm.org
    Python Version: ---

I breaks my repo by overlap existing folder with git-subrepo, But i forgot
delete original contents of folder. Therefore, later got constantly
notification of files changes, that are alredy in subrepo. And worse - hg many
operation, since it see changes, that caused by different file contents in
subrepo vs hostrepo.

Trying to solve this problem, i use censor, to erase contents of folder in same
commit, where hgsub appends new subrepo.

Censor fails to delete that files, with report:

```
D:\projects\contiki.hggit\tools>hg censor -r 16737
tools/cooja/apps\mspsim\src\org\contikios\cooja\mspmote\WismoteMote.java
яЁхЁтрэю: cannot censor file with no history
```
IMHO: censor should operate with any file in repo, even if it overlaped by
subrepo. Since mercurial core see it, and see that file changes, when subrepo
change contents.

Steps to reproduce:
1) have folder a with contens f.txt
a/f.txt
2) checkout in a/ new subrepo 
3) add to .hgsub subrepo over a:
cat a = [git]https://github.com*****/somerepo.git
3) hg commit .hgsub
Here have conflicts with contents a/ in host-repo, and contents of somerepo.git
4) try to delete  a/f.txt by censor:
hg censor -r top a/f.txt
here is censor reports, that file have no history

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


More information about the Mercurial-devel mailing list