##// END OF EJS Templates
update: teach hg to override untracked dir with a tracked file on update...
update: teach hg to override untracked dir with a tracked file on update This is a fix to an old problem when Mercurial got confused by an untracked folder with the same name as one of the files in a commit hg was trying to update to. It is pretty safe to remove this folder if it is empty. Backing up an empty folder seems to go against Mercurial's "don't track dirs" philosophy.

File last commit:

r16913:f2719b38 default
r29480:1e4512ea default
Show More
test-eol-clone.t
76 lines | 1.3 KiB | text/troff | Tads3Lexer
Matt Mackall
tests: unify test-eol-clone
r12422 Testing cloning with the EOL extension
Martin Geisler
tests: don't overwrite HGRCPATH...
r13519 $ cat >> $HGRCPATH <<EOF
Matt Mackall
tests: unify test-eol-clone
r12422 > [extensions]
> eol =
>
> [eol]
> native = CRLF
> EOF
setup repository
$ hg init repo
$ cd repo
$ cat > .hgeol <<EOF
> [patterns]
> **.txt = native
> EOF
$ printf "first\r\nsecond\r\nthird\r\n" > a.txt
$ hg commit --addremove -m 'checkin'
adding .hgeol
adding a.txt
Clone
$ cd ..
$ hg clone repo repo-2
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd repo-2
Mads Kiilerich
tests: use (esc) instead of other kinds of string escaping
r12943 $ cat a.txt
first\r (esc)
second\r (esc)
third\r (esc)
$ hg cat a.txt
Matt Mackall
tests: unify test-eol-clone
r12422 first
second
third
$ hg remove .hgeol
$ hg commit -m 'remove eol'
$ hg push --quiet
$ cd ..
Test clone of repo with .hgeol in working dir, but no .hgeol in tip
$ hg clone repo repo-3
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd repo-3
Mads Kiilerich
tests: use (esc) instead of other kinds of string escaping
r12943 $ cat a.txt
Matt Mackall
tests: unify test-eol-clone
r12422 first
second
third
Test clone of revision with .hgeol
$ cd ..
$ hg clone -r 0 repo repo-4
adding changesets
adding manifests
adding file changes
added 1 changesets with 2 changes to 2 files
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd repo-4
$ cat .hgeol
[patterns]
**.txt = native
Mads Kiilerich
tests: use (esc) instead of other kinds of string escaping
r12943 $ cat a.txt
first\r (esc)
second\r (esc)
third\r (esc)
Mads Kiilerich
tests: add missing trailing 'cd ..'...
r16913
$ cd ..