[Bug 4249] New: Clarify what happens when Mercurial can't find an ancestor

mercurial-bugs at selenic.com mercurial-bugs at selenic.com
Wed May 14 11:38:23 CDT 2014


http://bz.selenic.com/show_bug.cgi?id=4249

          Priority: normal
            Bug ID: 4249
                CC: mercurial-devel at selenic.com
          Assignee: bugzilla at selenic.com
           Summary: Clarify what happens when Mercurial can't find an
                    ancestor
          Severity: bug
    Classification: Unclassified
                OS: Windows
          Reporter: cowwoc at bbs.darktech.org
          Hardware: PC
            Status: UNCONFIRMED
           Version: 3.0
         Component: convert
           Product: Mercurial

In http://stackoverflow.com/q/23621793/14731 I am using splicemap to replace
one ancestor changeset with another. As a result, I get some warnings:

warning: can't find ancestor for
'service/src/main/java/com/vtlr/web/sql/package
-info.java' copied from 'service/src/main/java/com/vtlr/sql/package-info.java'!

I believe that "hg convert" is running across some files that was "added" by
the original changeset and that "add" operation is not present in the new
ancestor. So Mercurial is seeing a "modified" operation without an initial
commit.

In such a case, will the convert operation be smart enough to convert the
"modified" to an "add" with the full file contents? Or will it drop the file?
Or will it corrupt the file?

Expected behavior: the warning message should clarify how Mercurial dealt with
the problem. Right now users know something is wrong, but they have no way of
knowing whether it can be safely ignored.

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


More information about the Mercurial-devel mailing list