##// 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:

r28697:d001d6d2 default
r29480:1e4512ea default
Show More
test-record.t
89 lines | 2.6 KiB | text/troff | Tads3Lexer
Matt Mackall
tests: fix a bunch of pointless #s in unified tests
r12328 Set up a repo
Dan Villiom Podlaski Christiansen
tests: unify test-record
r12074
Yuya Nishihara
tests: write hgrc of more than two lines by using shell heredoc...
r23172 $ cat <<EOF >> $HGRCPATH
> [ui]
> interactive = true
> [extensions]
> record =
> EOF
Dan Villiom Podlaski Christiansen
tests: unify test-record
r12074
$ hg init a
$ cd a
Laurent Charignon
record: remove duplicated tests...
r24308 Record help
$ hg record -h
hg record [OPTION]... [FILE]...
interactively select changes to commit
timeless
minirst: change hgrole to use single quotes...
r27729 If a list of files is omitted, all changes reported by 'hg status' will be
Laurent Charignon
record: remove duplicated tests...
r24308 candidates for recording.
timeless
minirst: change hgrole to use single quotes...
r27729 See 'hg help dates' for a list of formats valid for -d/--date.
Laurent Charignon
record: remove duplicated tests...
r24308
You will be prompted for whether to record changes to each modified file,
and for files with multiple changes, for each change to use. For each
query, the following responses are possible:
y - record this change
n - skip this change
e - edit this change manually
s - skip remaining changes to this file
f - record remaining changes to this file
d - done, skip remaining changes and files
a - record all changes to all remaining files
q - quit, recording no changes
? - display help
This command is not available when committing a merge.
Pierre-Yves David
record: deprecate the extension...
r28697 (use "hg help -e record" to show help for the record extension)
Laurent Charignon
record: remove duplicated tests...
r24308 options ([+] can be repeated):
-A --addremove mark new/missing files as added/removed before
committing
Matt Mackall
commit: improve --close-branch documentation...
r25304 --close-branch mark a branch head as closed
Yuya Nishihara
commands: say "working directory" in full spelling
r24365 --amend amend the parent of the working directory
Laurent Charignon
record: remove duplicated tests...
r24308 -s --secret use the secret phase for committing
-e --edit invoke editor on commit messages
-I --include PATTERN [+] include names matching the given patterns
-X --exclude PATTERN [+] exclude names matching the given patterns
-m --message TEXT use text as commit message
-l --logfile FILE read commit message from file
-d --date DATE record the specified date as commit date
-u --user USER record the specified user as committer
-S --subrepos recurse into subrepositories
-w --ignore-all-space ignore white space when comparing lines
-b --ignore-space-change ignore changes in the amount of white space
-B --ignore-blank-lines ignore changes whose lines are all blank
(some details hidden, use --verbose to show complete help)
Dan Villiom Podlaski Christiansen
tests: unify test-record
r12074 Select no files
$ touch empty-rw
$ hg add empty-rw
$ hg record empty-rw<<EOF
> n
> EOF
diff --git a/empty-rw b/empty-rw
new file mode 100644
Mads Kiilerich
ui: show prompt choice if input is not a tty but is forced to be interactive...
r22589 examine changes to 'empty-rw'? [Ynesfdaq?] n
Dan Villiom Podlaski Christiansen
tests: unify test-record
r12074 no changes to record
$ hg tip -p
changeset: -1:000000000000
tag: tip
user:
date: Thu Jan 01 00:00:00 1970 +0000