##// END OF EJS Templates
largefiles: unlink standins not known to the restored dirstate at rollback...
largefiles: unlink standins not known to the restored dirstate at rollback Before this patch, standinds not known to the restored dirstate at rollback still exist after rollback of the parent of the working directory, and they become orphans unexpectedly. This patch unlinks standins not known to the restored dirstate. This patch saves names of standins matched against not "repo.dirstate[f] == 'a'" but "repo.dirstate[f] != 'r'" before rollback, because branch merging marks files newly added to dirstate as not "a" but "n". Such standins will also become orphan after rollback, because they are not known to the restored dirstate.

File last commit:

r16948:a0cbbf78 default
r22286:3f3b9483 default
Show More
test-convert-authormap.t
58 lines | 1.2 KiB | text/troff | Tads3Lexer
/ tests / test-convert-authormap.t
Matt Mackall
tests: unify test-convert-authormap
r12511
$ cat >> $HGRCPATH <<EOF
> [extensions]
> convert=
> EOF
Prepare orig repo
$ hg init orig
$ cd orig
$ echo foo > foo
$ HGUSER='user name' hg ci -qAm 'foo'
$ cd ..
Explicit --authors
$ cat > authormap.txt <<EOF
> user name = Long User Name
>
> # comment
> this line is ignored
> EOF
$ hg convert --authors authormap.txt orig new
initializing destination new repository
Martin Geisler
convert: lowercase status and abort messages
r16925 ignoring bad line in author map file authormap.txt: this line is ignored
Matt Mackall
tests: unify test-convert-authormap
r12511 scanning source...
sorting...
converting...
0 foo
Mads Kiilerich
tests: reintroduce globs in test-convert-authormap.t...
r16948 writing author map file $TESTTMP/new/.hg/authormap (glob)
Matt Mackall
tests: unify test-convert-authormap
r12511 $ cat new/.hg/authormap
user name=Long User Name
$ hg -Rnew log
changeset: 0:d89716e88087
tag: tip
user: Long User Name
date: Thu Jan 01 00:00:00 1970 +0000
summary: foo
$ rm -rf new
Implicit .hg/authormap
$ hg init new
$ mv authormap.txt new/.hg/authormap
$ hg convert orig new
Mads Kiilerich
tests: reintroduce globs in test-convert-authormap.t...
r16948 ignoring bad line in author map file $TESTTMP/new/.hg/authormap: this line is ignored (glob)
Matt Mackall
tests: unify test-convert-authormap
r12511 scanning source...
sorting...
converting...
0 foo
$ hg -Rnew log
changeset: 0:d89716e88087
tag: tip
user: Long User Name
date: Thu Jan 01 00:00:00 1970 +0000
summary: foo