Mercurial > hg
view tests/test-double-merge.t @ 18234:a55b06885cda
branchmap: allow to use cache of subset
Filtered repository are *subset* of unfiltered repository. This means that a
filtered branchmap could be use to compute the unfiltered version.
And filtered version happen to be subset of each other:
- "all() - unserved()" is a subset of "all() - hidden()"
- "all() - hidden()" is a subset of "all()"
This means that branchmap with "unfiltered" filter can be used as a base for
"hidden" branchmap that itself could be used as a base for unfiltered
branchmap.
unserved < hidden < None
This changeset implements this mechanism. If the on disk branchcache is not valid
we use the branchcache of the nearest subset as base instead of computing it from
scratch. Such fallback can be cascaded multiple time is necessary.
Note that both "hidden" and "unserved" set are a bit volatile. We will add more
stable filtering in next changesets.
This changeset enables collaboration between no filtering and "unserved"
filtering. Fixing performance regression introduced by 47f00b0de337
author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
---|---|
date | Mon, 07 Jan 2013 17:23:25 +0100 |
parents | a6fe1b9cc68f |
children | 5ed6a375e9ca |
line wrap: on
line source
$ hg init repo $ cd repo $ echo line 1 > foo $ hg ci -qAm 'add foo' copy foo to bar and change both files $ hg cp foo bar $ echo line 2-1 >> foo $ echo line 2-2 >> bar $ hg ci -m 'cp foo bar; change both' in another branch, change foo in a way that doesn't conflict with the other changes $ hg up -qC 0 $ echo line 0 > foo $ hg cat foo >> foo $ hg ci -m 'change foo' created new head we get conflicts that shouldn't be there $ hg merge -P changeset: 1:484bf6903104 user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: cp foo bar; change both $ hg merge --debug searching for copies back to rev 1 unmatched files in other: bar all copies found (* = to merge, ! = divergent, % = renamed and deleted): src: 'foo' -> dst: 'bar' * checking for directory renames resolving manifests overwrite: False, partial: False ancestor: e6dc8efe11cc, local: 6a0df1dad128+, remote: 484bf6903104 foo: versions differ -> m foo: remote copied to bar -> m preserving foo for resolve of bar preserving foo for resolve of foo updating: foo 1/2 files (50.00%) picked tool 'internal:merge' for bar (binary False symlink False) merging foo and bar to bar my bar@6a0df1dad128+ other bar@484bf6903104 ancestor foo@e6dc8efe11cc premerge successful updating: foo 2/2 files (100.00%) picked tool 'internal:merge' for foo (binary False symlink False) merging foo my foo@6a0df1dad128+ other foo@484bf6903104 ancestor foo@e6dc8efe11cc premerge successful 0 files updated, 2 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) contents of foo $ cat foo line 0 line 1 line 2-1 contents of bar $ cat bar line 0 line 1 line 2-2 $ cd ..