mirror of
https://github.com/facebook/sapling.git
synced 2024-10-06 14:58:03 +03:00
e0e01cbc81
Summary: This broke a bunch of tests. Revert it and re-enable all the tests. Reviewed By: DurhamG Differential Revision: D19665042 fbshipit-source-id: c3c17e3ac7e2ea028be5b5836bc8349cdf56184e
58 lines
1.1 KiB
Perl
58 lines
1.1 KiB
Perl
#chg-compatible
|
|
|
|
#require execbit
|
|
|
|
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
|
|
|
|
$ 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'
|
|
|
|
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)
|
|
$ chmod +x foo
|
|
$ hg ci -m 'merge'
|
|
|
|
this should not mention bar but should mention foo:
|
|
|
|
$ hg tip -v
|
|
changeset: 3:c53d17ff3380
|
|
parent: 2:ed1b79f46b9a
|
|
parent: 1:d394a8db219b
|
|
user: test
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
files: foo
|
|
description:
|
|
merge
|
|
|
|
|
|
|
|
$ hg debugindex bar
|
|
rev offset length ..... linkrev nodeid p1 p2 (re)
|
|
0 0 5 ..... 1 b004912a8510 000000000000 000000000000 (re)
|
|
|
|
$ cd ..
|