[PATCH STABLE] convert: detect removal of ".gitmodules" at git source revisions correctly
Matt Mackall
mpm at selenic.com
Tue Jul 1 18:46:08 CDT 2014
On Tue, 2014-07-01 at 15:47 -0500, Matt Mackall wrote:
> On Sun, 2014-06-29 at 00:11 +0900, FUJIWARA Katsunori wrote:
> > # HG changeset patch
> > # User FUJIWARA Katsunori <foozy at lares.dti.ne.jp>
> > # Date 1403966784 -32400
> > # Sat Jun 28 23:46:24 2014 +0900
> > # Branch stable
> > # Node ID cb8567d0c76d7c0e66d2fe32607acc8621d2389f
> > # Parent a4b67bf1f0a5051736c14d9c13fae50fd5f5e464
> > convert: detect removal of ".gitmodules" at git source revisions correctly
>
> Queued for stable, thanks.
Breaks tests:
$ hg convert -q git-repo6 git-repo6-hg
+ transaction abort!
+ rollback completed
+ Traceback (most recent call last):
+ File "/dev/shm/hgtests.uBEOuH/install/bin/hg", line 43, in <module>
+ mercurial.dispatch.run()
+ File "/dev/shm/hgtests.uBEOuH/install/lib/python/mercurial/dispatch.py", line 28, in run
+ sys.exit((dispatch(request(sys.argv[1:])) or 0) & 255)
+ File "/dev/shm/hgtests.uBEOuH/install/lib/python/mercurial/dispatch.py", line 69, in dispatch
+ ret = _runcatch(req)
+ File "/dev/shm/hgtests.uBEOuH/install/lib/python/mercurial/dispatch.py", line 228, in _runcatch
+ elif util.safehasattr(inst, "args") and inst.args[0] == errno.EPIPE:
+ IndexError: tuple index out of range
+ [1]
$ hg -R git-repo6-hg tip -T "{desc|firstline}\n"
- remove .gitmodules and submodule git-repo5
+ addsubmodule
$ hg -R git-repo6-hg tip -T "{file_dels}\n"
- .hgsub .hgsubstate
+
--
Mathematics is the supreme nostalgia of our time.
More information about the Mercurial-devel
mailing list