mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 23:38:50 +03:00
50d5690f2a
Right now, there are some situations in which localrepo.filecommit can create filelog entries even though they're not needed. For example: - permissions for a file have changed; - qrefresh can create a filelog entry identical to its parent (see the added test); - convert-repo creates extra filelog entries in every merge where the first parent has added files (for example, changeset ebebe9577a1a of the kernel repo added extra filelog entries to files in the arch/blackfin directory, even though the merge should only touch the drivers/ata directory). This makes "hg log file" in a converted repo less useful than it could be, since it may mention many merges that don't actually touch that specific file. They all come from the same basic problem: localrepo.commit (through filecommit) creates new filelog entries for all files passed to it (except for some cases during a merge). Patch and test case provided by Benoit. This should fix issue351.
100 lines
2.8 KiB
Plaintext
100 lines
2.8 KiB
Plaintext
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
pulling from ../test1
|
|
requesting all changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 2 changes to 2 files
|
|
(run 'hg update' to get a working copy)
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
% the changelog should mention file a:
|
|
a
|
|
pulling from ../test2
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 0 changes to 0 files (+1 heads)
|
|
(run 'hg heads' to see heads, 'hg merge' to merge)
|
|
changeset: 2:37dccb76c058
|
|
tag: tip
|
|
parent: 0:4536b1c2ca69
|
|
user: test
|
|
date: Mon Jan 12 13:46:40 1970 +0000
|
|
summary: chmod +x a
|
|
|
|
changeset: 1:a187cb361a5a
|
|
user: test
|
|
date: Mon Jan 12 13:46:40 1970 +0000
|
|
summary: a updated
|
|
|
|
changeset: 2:37dccb76c058
|
|
tag: tip
|
|
parent: 0:4536b1c2ca69
|
|
user: test
|
|
date: Mon Jan 12 13:46:40 1970 +0000
|
|
summary: chmod +x a
|
|
|
|
changeset: 1:a187cb361a5a
|
|
user: test
|
|
date: Mon Jan 12 13:46:40 1970 +0000
|
|
summary: a updated
|
|
|
|
changeset: 0:4536b1c2ca69
|
|
user: test
|
|
date: Mon Jan 12 13:46:40 1970 +0000
|
|
summary: added a b
|
|
|
|
resolving manifests
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
pulling from ../test2
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 0 changes to 0 files (+1 heads)
|
|
(run 'hg heads' to see heads, 'hg merge' to merge)
|
|
changeset: 2:37dccb76c058
|
|
tag: tip
|
|
parent: 0:4536b1c2ca69
|
|
user: test
|
|
date: Mon Jan 12 13:46:40 1970 +0000
|
|
summary: chmod +x a
|
|
|
|
changeset: 1:d54568174d8e
|
|
user: test
|
|
date: Mon Jan 12 13:46:40 1970 +0000
|
|
summary: b updated
|
|
|
|
changeset: 2:37dccb76c058
|
|
tag: tip
|
|
parent: 0:4536b1c2ca69
|
|
user: test
|
|
date: Mon Jan 12 13:46:40 1970 +0000
|
|
summary: chmod +x a
|
|
|
|
changeset: 1:d54568174d8e
|
|
user: test
|
|
date: Mon Jan 12 13:46:40 1970 +0000
|
|
summary: b updated
|
|
|
|
changeset: 0:4536b1c2ca69
|
|
user: test
|
|
date: Mon Jan 12 13:46:40 1970 +0000
|
|
summary: added a b
|
|
|
|
resolving manifests
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
-rwxr-x---
|
|
-rwxr-x---
|
|
-rwxr-x---
|
|
rev offset length base linkrev nodeid p1 p2
|
|
0 0 0 0 0 b80de5d13875 000000000000 000000000000
|
|
rev offset length base linkrev nodeid p1 p2
|
|
0 0 0 0 0 b80de5d13875 000000000000 000000000000
|
|
rev offset length base linkrev nodeid p1 p2
|
|
0 0 0 0 0 b80de5d13875 000000000000 000000000000
|
|
1 0 5 1 1 7fe919cc0336 b80de5d13875 000000000000
|