Patchwork [Bug,4786] New: Moving a file during a merge results in abort: some/file.py@81b3fc3b9732: not found in manifest!

login
register
mail settings
Submitter mercurial-bugs@selenic.com
Date Aug. 19, 2015, 5:14 p.m.
Message ID <bug-4786-285@http.bz.selenic.com/>
Download mbox | patch
Permalink /patch/10242/
State Not Applicable
Headers show

Comments

mercurial-bugs@selenic.com - Aug. 19, 2015, 5:14 p.m.
http://bz.selenic.com/show_bug.cgi?id=4786

          Priority: normal
            Bug ID: 4786
                CC: mercurial-devel@selenic.com
          Assignee: bugzilla@selenic.com
           Summary: Moving a file during a merge results in abort:
                    some/file.py@81b3fc3b9732: not found in manifest!
          Severity: bug
    Classification: Unclassified
                OS: Mac OS
          Reporter: rpkelly22@gmail.com
          Hardware: PC
            Status: UNCONFIRMED
           Version: 3.5-rc
         Component: Mercurial
           Product: Mercurial

As follows:

[13:05:33]ryan@planck:hgwut$ cd ..
[13:05:35]ryan@planck:tmp$ rm -rf hgwut
[13:05:37]ryan@planck:tmp$ mkdir hgwut
[13:05:40]ryan@planck:tmp$ cd !$
cd hgwut
[13:05:41]ryan@planck:hgwut$ virtualenv venv
New python executable in venv/bin/python
Installing
distribute......s...o....................................................................................................................u....................................r.................c....
.......done.
Installing pip...............done.
[13:05:47]ryan@planck:hgwut$ source venv/bin/activate
(venv)[13:05:50]ryan@planck:hgwut$ pip install mercurial
Downloading/unpacking mercurial
  Downloading mercurial-3.5-rc.tar.gz (4.4Mb): 4.4Mb downloaded
  Running setup.py egg_info for package mercurial

Installing collected packages: mercurial
  Running setup.py install for mercurial
    generating mercurial/locale/pt_BR/LC_MESSAGES/hg.mo from i18n/pt_BR.po
    msgfmt -v -o mercurial/locale/pt_BR/LC_MESSAGES/hg.mo i18n/pt_BR.po -c
    5006 translated messages.
    generating mercurial/locale/zh_CN/LC_MESSAGES/hg.mo from i18n/zh_CN.po
    msgfmt -v -o mercurial/locale/zh_CN/LC_MESSAGES/hg.mo i18n/zh_CN.po -c
    335 translated messages, 203 fuzzy translations, 1792 untranslated
messages.
    generating mercurial/locale/da/LC_MESSAGES/hg.mo from i18n/da.po
    msgfmt -v -o mercurial/locale/da/LC_MESSAGES/hg.mo i18n/da.po -c
    1949 translated messages, 92 fuzzy translations, 1831 untranslated
messages.
    generating mercurial/locale/fr/LC_MESSAGES/hg.mo from i18n/fr.po
    msgfmt -v -o mercurial/locale/fr/LC_MESSAGES/hg.mo i18n/fr.po -c
    358 translated messages, 104 fuzzy translations, 1775 untranslated
messages.
    generating mercurial/locale/ja/LC_MESSAGES/hg.mo from i18n/ja.po
    msgfmt -v -o mercurial/locale/ja/LC_MESSAGES/hg.mo i18n/ja.po -c
    5004 translated messages, 2 untranslated messages.
    generating mercurial/locale/sv/LC_MESSAGES/hg.mo from i18n/sv.po
    msgfmt -v -o mercurial/locale/sv/LC_MESSAGES/hg.mo i18n/sv.po -c
    2039 translated messages, 1 fuzzy translation, 2196 untranslated messages.
    generating mercurial/locale/it/LC_MESSAGES/hg.mo from i18n/it.po
    msgfmt -v -o mercurial/locale/it/LC_MESSAGES/hg.mo i18n/it.po -c
    generating mercurial/locale/it/LC_MESSAGES/hg.mo from i18n/it.po
    msgfmt -v -o mercurial/locale/it/LC_MESSAGES/hg.mo i18n/it.po -c
    1871 translated messages, 3 fuzzy translations, 1234 untranslated messages.
    generating mercurial/locale/de/LC_MESSAGES/hg.mo from i18n/de.po
    msgfmt -v -o mercurial/locale/de/LC_MESSAGES/hg.mo i18n/de.po -c
    3200 translated messages, 102 fuzzy translations, 1301 untranslated
messages.
    generating mercurial/locale/el/LC_MESSAGES/hg.mo from i18n/el.po
    msgfmt -v -o mercurial/locale/el/LC_MESSAGES/hg.mo i18n/el.po -c
    312 translated messages, 35 fuzzy translations, 1936 untranslated messages.
    generating mercurial/locale/ro/LC_MESSAGES/hg.mo from i18n/ro.po
    msgfmt -v -o mercurial/locale/ro/LC_MESSAGES/hg.mo i18n/ro.po -c
    676 translated messages, 4 fuzzy translations, 2806 untranslated messages.
    generating mercurial/locale/ru/LC_MESSAGES/hg.mo from i18n/ru.po
    msgfmt -v -o mercurial/locale/ru/LC_MESSAGES/hg.mo i18n/ru.po -c
    4668 translated messages, 10 untranslated messages.
    generating mercurial/locale/zh_TW/LC_MESSAGES/hg.mo from i18n/zh_TW.po
    msgfmt -v -o mercurial/locale/zh_TW/LC_MESSAGES/hg.mo i18n/zh_TW.po -c
    640 translated messages, 8 fuzzy translations, 2372 untranslated messages.
    building 'mercurial.base85' extension
    gcc -pthread -fno-strict-aliasing -DNDEBUG -g -fwrapv -O2 -Wall
-Wstrict-prototypes -fPIC -I/usr/include/python2.7 -c mercurial/base85.c -o
build/temp.linux-x86_64-2.7/mercurial/base85.o
    gcc -pthread -shared -Wl,-O1 -Wl,-Bsymbolic-functions
-Wl,-Bsymbolic-functions -Wl,-z,relro
build/temp.linux-x86_64-2.7/mercurial/base85.o -o
build/lib.linux-x86_64-2.7/mercurial/base85.so
    building 'mercurial.bdiff' extension
    gcc -pthread -fno-strict-aliasing -DNDEBUG -g -fwrapv -O2 -Wall
-Wstrict-prototypes -fPIC -I/usr/include/python2.7 -c mercurial/bdiff.c -o
build/temp.linux-x86_64-2.7/mercurial/bdiff.o
    gcc -pthread -shared -Wl,-O1 -Wl,-Bsymbolic-functions
-Wl,-Bsymbolic-functions -Wl,-z,relro
build/temp.linux-x86_64-2.7/mercurial/bdiff.o -o
build/lib.linux-x86_64-2.7/mercurial/bdiff.so
    building 'mercurial.diffhelpers' extension
    gcc -pthread -fno-strict-aliasing -DNDEBUG -g -fwrapv -O2 -Wall
-Wstrict-prototypes -fPIC -I/usr/include/python2.7 -c mercurial/diffhelpers.c
-o build/temp.linux-x86_64-2.7/mercurial/diffhelpers.o
    gcc -pthread -shared -Wl,-O1 -Wl,-Bsymbolic-functions
-Wl,-Bsymbolic-functions -Wl,-z,relro
build/temp.linux-x86_64-2.7/mercurial/diffhelpers.o -o
build/lib.linux-x86_64-2.7/mercurial/diffhelpers.so
    building 'mercurial.mpatch' extension
    gcc -pthread -fno-strict-aliasing -DNDEBUG -g -fwrapv -O2 -Wall
-Wstrict-prototypes -fPIC -I/usr/include/python2.7 -c mercurial/mpatch.c -o
build/temp.linux-x86_64-2.7/mercurial/mpatch.o
    gcc -pthread -shared -Wl,-O1 -Wl,-Bsymbolic-functions
-Wl,-Bsymbolic-functions -Wl,-z,relro
build/temp.linux-x86_64-2.7/mercurial/mpatch.o -o
build/lib.linux-x86_64-2.7/mercurial/mpatch.so
    building 'mercurial.parsers' extension
    gcc -pthread -fno-strict-aliasing -DNDEBUG -g -fwrapv -O2 -Wall
-Wstrict-prototypes -fPIC -I/usr/include/python2.7 -c mercurial/dirs.c -o
build/temp.linux-x86_64-2.7/mercurial/dirs.o
    gcc -pthread -fno-strict-aliasing -DNDEBUG -g -fwrapv -O2 -Wall
-Wstrict-prototypes -fPIC -I/usr/include/python2.7 -c mercurial/manifest.c -o
build/temp.linux-x86_64-2.7/mercurial/manifest.o
    gcc -pthread -fno-strict-aliasing -DNDEBUG -g -fwrapv -O2 -Wall
-Wstrict-prototypes -fPIC -I/usr/include/python2.7 -c mercurial/parsers.c -o
build/temp.linux-x86_64-2.7/mercurial/parsers.o
    gcc -pthread -fno-strict-aliasing -DNDEBUG -g -fwrapv -O2 -Wall
-Wstrict-prototypes -fPIC -I/usr/include/python2.7 -c mercurial/pathencode.c -o
build/temp.linux-x86_64-2.7/mercurial/pathencode.o
    gcc -pthread -shared -Wl,-O1 -Wl,-Bsymbolic-functions
-Wl,-Bsymbolic-functions -Wl,-z,relro
build/temp.linux-x86_64-2.7/mercurial/dirs.o
build/temp.linux-x86_64-2.7/mercurial/manifest.o
build/temp.linux-x86_64-2.7/mercurial/parsers.o
build/temp.linux-x86_64-2.7/mercurial/pathencode.o -o
build/lib.linux-x86_64-2.7/mercurial/parsers.so
    building 'mercurial.osutil' extension
    gcc -pthread -fno-strict-aliasing -DNDEBUG -g -fwrapv -O2 -Wall
-Wstrict-prototypes -fPIC -I/usr/include/python2.7 -c mercurial/osutil.c -o
build/temp.linux-x86_64-2.7/mercurial/osutil.o
    gcc -pthread -shared -Wl,-O1 -Wl,-Bsymbolic-functions
-Wl,-Bsymbolic-functions -Wl,-z,relro
build/temp.linux-x86_64-2.7/mercurial/osutil.o -o
build/lib.linux-x86_64-2.7/mercurial/osutil.so
    changing mode of build/scripts-2.7/hg from 644 to 755

    changing mode of /tmp/hgwut/venv/bin/hg to 755
Successfully installed mercurial
Cleaning up...
(venv)[13:06:02]ryan@planck:hgwut$ hg init
(venv)[13:06:05]ryan@planck:hgwut$ hg branch test
marked working directory as branch test
(branches are permanent and global, did you want a bookmark?)
(venv)[13:06:08]ryan@planck:hgwut$ hg commit
committing changelog
committed changeset 0:59e62cca2c1a
(venv)[13:06:13]ryan@planck:hgwut$ hg update default
abort: unknown revision 'default'!
(venv)[13:06:16]ryan@planck:hgwut$ hg branch other
marked working directory as branch other
(venv)[13:06:28]ryan@planck:hgwut$ hg commit
committing changelog
committed changeset 1:81b3fc3b9732
(venv)[13:06:32]ryan@planck:hgwut$ hg update test
resolving manifests
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(venv)[13:06:35]ryan@planck:hgwut$ mkdir some
(venv)[13:06:43]ryan@planck:hgwut$ echo 'print("hi")' > some/file.py
(venv)[13:06:52]ryan@planck:hgwut$ hg add !$
hg add some/file.py
adding some/file.py
(venv)[13:06:55]ryan@planck:hgwut$ hg commit -m 'add file'
committing files:
some/file.py
committing manifest
committing changelog
committed changeset 2:73f78b35e304
(venv)[13:07:01]ryan@planck:hgwut$ hg update other
resolving manifests
removing some/file.py
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
(venv)[13:07:04]ryan@planck:hgwut$ hg merge test
resolving manifests
getting some/file.py
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
(venv)[13:07:08]ryan@planck:hgwut$ mkdir other
(venv)[13:07:11]ryan@planck:hgwut$ hg mv some/file.py other/place.py
moving some/file.py to other/place.py
(venv)[13:07:19]ryan@planck:hgwut$ hg diff
abort: some/file.py@81b3fc3b9732: not found in manifest!
(venv)[13:07:20]ryan@planck:hgwut$ 
(venv)[13:12:17]ryan@planck:hgwut$ hg verify
repository uses revlog format 1
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 3 changesets, 1 total revisions

Patch

diff -r 81b3fc3b9732 other/place.py
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/other/place.py    Wed Aug 19 13:07:20 2015 -0400
@@ -0,0 +1,1 @@ 
+print("hi")