[Bug 4567] New: histedit abort; rename & fold interactions

mercurial-bugs at selenic.com mercurial-bugs at selenic.com
Thu Mar 12 19:27:26 UTC 2015


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

          Priority: normal
            Bug ID: 4567
                CC: mercurial-devel at selenic.com
          Assignee: bugzilla at selenic.com
           Summary: histedit abort; rename & fold interactions
          Severity: bug
    Classification: Unclassified
                OS: Windows
          Reporter: err at raelity.com
          Hardware: PC
            Status: UNCONFIRMED
           Version: 3.3.2
         Component: histedit
           Product: Mercurial

Goal is to rename several directories at the top level of a repo,
each "hg mv" does lots of remove&adds. One change is a directory name
from MetaWB to metawb. I'm one Win7, so this was a two step operataion.

There are actually two failure scenarios, but they are probably the same
issue.

=== Scenario 1

To reproduce:

   hg mv SomeDir some.dir
   hg ci
   hg mv MetaWB metawbx
   edit a couple of files in the depths of metawbx
   hg mv metawbx metawb
   hg ci
   hg histedit -o
   ### do pick some.dir; fold metawb
   ...abort: The system cannot find the file specified... 

(this was from a more complex situation)


=== Scenario 2

After this, I decided to take another approach. There were about 6 directories
involved. Two of them were only case changes, two lifted a sub directory up to
a top level.

Phase 1: rename all the stuff, modify no files.
         phase 1 produced several changesets, I folded them
         into a single changeset and proceeded to phase 2.
Phase 2: modify the files as needed to get things to build.
         This produced a single changeset.

Then attempted to fold phase 2 into phase 1. This resulted in:
    astro/nbproject/suite.properties: untracked file differs
    astro/src/org/metawb/astro/Bundle.properties: untracked file differs
    metawb/nbproject/suite.properties: untracked file differs
    metawb/src/org/metawb/Bundle.properties: untracked file differs
    metawb/test/unit/src/org/metawb/lib/TestUtil.java: untracked file differs
    abort: untracked files in working directory differ
           from files in requested revision

The "untacked file" are the files changed in the two directories,
metawb and astro, that were renamed in a two step process.

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


More information about the Mercurial-devel mailing list