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

[Mike Miller]

Update of bug #53508 (project octave):

                  Status:                    None => Invalid                
             Open/Closed:                    Open => Closed                 

    _______________________________________________________

Follow-up Comment #1:

The warning message does exactly tell you which file is the problem,
build-aux/move-if-change.

On release-4-2-2, build-aux/move-if-change was a file in the source
repository. On the current stable and default branches, it is not. If you run
bootstrap on the current branch heads, build-aux/move-if-change will be a
symlink. If you then try to update to release-4-2-2, it will rightly complain
about a file conflict.

The correct way to clean the entire source tree is 'hg purge --all'. Without
the '--all' option it does not delete files that match the .hgignore patterns.
If you used 'hg purge --all' you should be fine.

Also you should not be using 'tip', especially when a lot of work is happening
on both default and stable, 'tip' may resolve to either the head of the
default branch or the head of the stable branch.

    _______________________________________________________

Reply to this item at:

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

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