relnotes: copy "next" to "5.1" and clear "next"
To avoid merge conflicts, we want to avoid modifying the file on
multiple branches in parallel. This patch is therefore meant to be
applied to the stable branch and then quickly be merged to default (at
least before edits are made to relnotes/next there).
Another option would have been to copy the file on the stable branch
and to clear it on the default branch. However, that still results in
conflicts if the copy is edited on the stable branch (Mercurial would
try to apply the changes from the default branch to it).
We could also delete the file in one commit and recreate it in another
commit. However, Mercurial is quite inconsistent in what it considers
a break in history (see test-copies-unrelated.t), so I'd like to avoid
that.
Differential Revision: https://phab.mercurial-scm.org/D6705
Test update logic when there are renames or weird same-name cases between dirs
and files
Update with local changes across a file rename
$ hg init r1 && cd r1
$ echo a > a
$ hg add a
$ hg ci -m a
$ hg mv a b
$ hg ci -m rename
$ echo b > b
$ hg ci -m change
$ hg up -q 0
$ echo c > a
$ hg up
merging a and b to b
warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges
[1]
Test update when local untracked directory exists with the same name as a
tracked file in a commit we are updating to
$ hg init r2 && cd r2
$ echo root > root && hg ci -Am root # rev 0
adding root
$ echo text > name && hg ci -Am "name is a file" # rev 1
adding name
$ hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ mkdir name
$ hg up 1
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Test update when local untracked directory exists with some files in it and has
the same name a tracked file in a commit we are updating to. In future this
should be updated to give an friendlier error message, but now we should just
make sure that this does not erase untracked data
$ hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ mkdir name
$ echo text > name/file
$ hg st
? name/file
$ hg up 1
abort: Unlinking directory not permitted: *$TESTTMP/r1/r2/name* (glob) (windows !)
abort: Directory not empty: '?\$TESTTMP/r1/r2/name'? (re) (no-windows !)
[255]
$ cat name/file
text
$ cd ..
#if symlink
Test update when two commits have symlinks that point to different folders
$ hg init r3 && cd r3
$ echo root > root && hg ci -Am root
adding root
$ mkdir folder1 && mkdir folder2
$ ln -s folder1 folder
$ hg ci -Am "symlink to folder1"
adding folder
$ rm folder
$ ln -s folder2 folder
$ hg ci -Am "symlink to folder2"
$ hg up 1
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd ..
#endif
#if rmcwd
Test that warning is printed if cwd is deleted during update
$ hg init r4 && cd r4
$ mkdir dir
$ cd dir
$ echo a > a
$ echo b > b
$ hg add a b
$ hg ci -m "file and dir"
$ hg up -q null
current directory was removed
(consider changing to repo root: $TESTTMP/r1/r4)
#endif