[Octave-bug-tracker] [bug #53508] "untracked file differs" complication checking out tagged release-4-2-2

[Dan Sebald]

URL:
  <http://savannah.gnu.org/bugs/?53508>

                 Summary: "untracked file differs" complication checking out
tagged release-4-2-2
                 Project: GNU Octave
            Submitted by: sebald
            Submitted on: Wed 28 Mar 2018 09:55:10 PM UTC
                Category: Configuration and Build System
                Severity: 3 - Normal
                Priority: 5 - Normal
              Item Group: Build Failure
                  Status: None
             Assigned to: None
         Originator Name: 
        Originator Email: 
             Open/Closed: Open
         Discussion Lock: Any
                 Release: dev
        Operating System: GNU/Linux

    _______________________________________________________

Details:

I've run into an error attempting to get release-4-2-2 so that I may check if
Bug #53500 is fixed in 4.2.2 (it's fixed in dev version).  I went back to a
fresh clone to illustrate:


address@hidden ~/octave/octave-test123/octave $ hg clone
http://hg.savannah.gnu.org/hgweb/octave
address@hidden ~/octave/octave-test123/octave $ cd octave/
address@hidden ~/octave/octave-test123/octave $ hg checkout release-4-2-2
[works]
address@hidden ~/octave/octave-test123/octave $ hg checkout tip
[works]
address@hidden ~/octave/octave-test123/octave $ hg checkout release-4-2-2
[works]
address@hidden ~/octave/octave-test123/octave $ hg checkout tip
[works]
address@hidden ~/octave/octave-test123/octave $ ./bootstrap
[continues as expected]
address@hidden ~/octave/octave-test123/octave $ hg checkout release-4-2-2
resolving manifests
build-aux/move-if-change: untracked file differs
abort: untracked files in working directory differ from files in requested
revision


Perhaps this is my misunderstanding of how checking out a tagged release
should work.  The way I would characterize this is that anything on the stable
branch at or before changeset

24880 (68720b4477e4) maint: merge away extra head on stable branch

creates this error message.  Checking things out from the dev branch shows no
problems.

The warning message doesn't indicate what files this is failing on so that I
may delete them.  I do an "hg purge" and see no untracked files in the
directogy, but still get


address@hidden ~/octave/octave-test123/octave $ hg purge
address@hidden ~/octave/octave-test123/octave $ hg checkout release-4-2-2
resolving manifests
build-aux/move-if-change: untracked file differs
abort: untracked files in working directory differ from files in requested
revision







    _______________________________________________________

Reply to this item at:

  <http://savannah.gnu.org/bugs/?53508>

_______________________________________________
  Message sent via/by Savannah
  http://savannah.gnu.org/