mirror of
https://github.com/facebook/sapling.git
synced 2024-10-11 17:27:53 +03:00
c8ff620c56
For filelogs, debugindex and debugdata can be called with the file name directly instead of the path to the revlog. Since in the future filelogs will no longer be valid revlogs, calling with a path to the revlog is deprecated for debugdata. For debugindex it is expected to still work, but I changed them as well for consistency.
54 lines
1.1 KiB
Perl
54 lines
1.1 KiB
Perl
b51a8138292a introduced a regression where we would mention in the
|
|
changelog executable files added by the second parent of a merge. Test
|
|
that that doesn't happen anymore
|
|
|
|
$ "$TESTDIR/hghave" execbit || exit 80
|
|
|
|
$ hg init repo
|
|
$ cd repo
|
|
$ echo foo > foo
|
|
$ hg ci -qAm 'add foo'
|
|
|
|
$ echo bar > bar
|
|
$ chmod +x bar
|
|
$ hg ci -qAm 'add bar'
|
|
|
|
manifest of p2:
|
|
|
|
$ hg manifest
|
|
bar
|
|
foo
|
|
|
|
$ hg up -qC 0
|
|
$ echo >> foo
|
|
$ hg ci -m 'change foo'
|
|
created new head
|
|
|
|
manifest of p1:
|
|
|
|
$ hg manifest
|
|
foo
|
|
|
|
$ hg merge
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
$ hg ci -m 'merge'
|
|
|
|
this should not mention bar:
|
|
|
|
$ hg tip -v
|
|
changeset: 3:ef2fc9b4a51b
|
|
tag: tip
|
|
parent: 2:ed1b79f46b9a
|
|
parent: 1:d394a8db219b
|
|
user: test
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
description:
|
|
merge
|
|
|
|
|
|
|
|
$ hg debugindex bar
|
|
rev offset length base linkrev nodeid p1 p2
|
|
0 0 5 0 1 b004912a8510 000000000000 000000000000
|