Problem with merge after a dir rename

[Simon King]

On Thu, Jan 14, 2016 at 3:59 PM, Long Vu <long.vu at intelerad.com> wrote:

> On Wed, Jan 13, 2016 at 10:34 AM, Matt Mackall <mpm at selenic.com> wrote:
> > On Tue, 2016-01-12 at 15:28 -0500, Long Vu wrote:
> >> Hi,
> >>
> >> We are cleaning up our source tree filesystem layout and we encounter
> >> this problem.
> >>
> >> I've captured it in mercurial test format below, against current tip of
> >> stable.
> >>
> >> Is this a known problem?  Is there a quick work-around to prevent
> >> mercurial from silently randomly choosing a destination dir?
> >>
> >> create initial repo
> >>   $ hg init repo
> >>   $ cd repo
> >>   $ mkdir -p java-project/com/package
> >>   $ echo Source > java-project/com/package/Source.java
> >>   $ echo Test > java-project/com/package/Test.java
> >>   $ hg ci -Am "create source test file in same folder initially"
> >>   adding java-project/com/package/Source.java
> >>   adding java-project/com/package/Test.java
> >>   $ hg -q branch releasebranch
> >>   $ hg ci -m "cut release branch"
> >
> > (Neither Java's weird directory layout conventions nor your branching
> strategy
> > appear to be relevant here, so that level of detail is only making your
> example
> > harder to read.)
> >
>
> Just being defensive in case someone says "this looks like an edge
> case, why would you ever do renames like that".
>
> >> perform refactoring on trunk
> >>   $ hg -q up default
> >>   $ mkdir -p java-project/source/com/package
> >>   $ hg mv java-project/com/package/Source.java java-
> >> project/source/com/package/
> >>   $ hg mv java-project/com java-project/test/com
> >>   moving java-project/com/package/Test.java to
> >> java-project/test/com/package/Test.java
> >>   $ hg ci -Am "refactoring on trunk, proper source/ test/ layout"
> >>
> >> create new file in release branch, merge forward and get wrong behavior
> >>   $ hg -q up releasebranch
> >>   $ echo Source2 > java-project/com/package/Source2.java
> >>   $ echo Test2 > java-project/com/package/Test2.java
> >>   $ hg ci -Am "create new source test on old branch to test merge
> >> forward to trunk"
> >>   adding java-project/com/package/Source2.java
> >>   adding java-project/com/package/Test2.java
> >>   $ hg -q up default
> >>   $ hg merge releasebranch
> >>   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
> >>   (branch merge, don't forget to commit)
> >
> >>   $ hg diff
> >>   abort: java-project/com/package/Source2.java@[a-f0-9]{12}: not found
> >> in manifest! (re)
> >>   [255]
> >
> > Don't know what this is about but I can't seem to repro it.
>
> Weird, I can consistently reproduce with our real repo and this toy repo.
>
> That said we are on Centos 6 with python 2.6.6 so maybe I should retry
> with Cento 7 and Python 2.7.5 (the one that came with Centos 7).
>
>
I wonder if this is issue4786:

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

Simon
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial/attachments/20160114/73122f1f/attachment.html>