##// END OF EJS Templates
fetch: switch the default parent used for a merge...
fetch: switch the default parent used for a merge This treats newly pulled changes as authoritative, and local changes as the "satellite" changes. The prior default behaviour is still available, via the --switch-parent option.

File last commit:

r6139:989467e8 default
r6206:0b6f1249 default
Show More
test-commit.out
94 lines | 1.9 KiB | text/plain | TextLexer
% commit date test
transaction abort!
rollback completed
abort: empty commit message
abort: impossible time zone offset: 4444444
abort: invalid date: '1\t15.1'
abort: invalid date: 'foo bar'
abort: date exceeds 32 bits: 111111111111
% commit added file that has been deleted
nothing changed
abort: file bar not found!
adding dir/file
dir/file
adding dir.file
abort: no match under directory dir!
abort: no match under directory .!
abort: no match under directory ../dir2!
dir/file
does-not-exist: No such file or directory
abort: file does-not-exist not found!
abort: file baz not tracked!
abort: file quux not tracked!
dir/file
% partial subdir commit test
adding bar/bar
adding foo/foo
% subdir log 1
changeset: 0:6ef3cb06bb80
user: test
date: Mon Jan 12 13:46:40 1970 +0000
files: foo/foo
description:
commit-subdir-1
% subdir log 2
changeset: 1:f2e51572cf5a
tag: tip
user: test
date: Mon Jan 12 13:46:41 1970 +0000
files: bar/bar
description:
commit-subdir-2
% full log
changeset: 1:f2e51572cf5a
tag: tip
user: test
date: Mon Jan 12 13:46:41 1970 +0000
files: bar/bar
description:
commit-subdir-2
changeset: 0:6ef3cb06bb80
user: test
date: Mon Jan 12 13:46:40 1970 +0000
files: foo/foo
description:
commit-subdir-1
% dot and subdir commit test
% full log
changeset: 1:d9180e04fa8a
tag: tip
user: test
date: Sat Jan 24 03:33:20 1970 +0000
files: foo/plain-file
description:
commit-foo-dot
changeset: 0:80b572aaf098
user: test
date: Mon Jan 12 13:46:40 1970 +0000
files: foo/plain-file
description:
commit-foo-subdir
% subdir log
changeset: 1:d9180e04fa8a
tag: tip
user: test
date: Sat Jan 24 03:33:20 1970 +0000
summary: commit-foo-dot
changeset: 0:80b572aaf098
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: commit-foo-subdir