Mercurial > hg
annotate tests/test-convert-bzr-merges.out @ 7654:816b708f23af
store all heads of a branch in the branch cache
All heads of branches will be stored in a new cache file 'branchheads.cache'
within the .hg directory. The old 'branch.cache' file from older versions
will be ignored.
The new cache contents are formatted line-by-line as '{node} {branchtag}\n'.
This is the same as the previous format. Now, every head is recorded in
an oldest -> tipmost order.
The localrepo.branchheads function is reworked to use the data from the cache.
| author | John Mulligan <phlogistonjohn@asynchrono.us> |
|---|---|
| date | Wed, 14 Jan 2009 21:47:38 -0500 |
| parents | 209ef5f3534c |
| children |
| rev | line source |
|---|---|
| 7053 | 1 % test multiple merges at once |
| 2 initializing destination source-hg repository | |
| 3 scanning source... | |
| 4 sorting... | |
| 5 converting... | |
| 6 4 Initial add | |
| 7 3 Added branch1 file | |
| 8 2 Added parent file | |
| 9 1 Added brach2 file | |
| 10 0 Merged branches | |
| 11 o 5 "(octopus merge fixup)" files: | |
| 12 |\ | |
| 13 | o 4 "Merged branches" files: file-branch2 | |
| 14 | |\ | |
| 15 o---+ 3 "Added brach2 file" files: file-branch2 | |
| 16 / / | |
| 17 | o 2 "Added parent file" files: file-parent | |
| 18 | | | |
| 19 o | 1 "Added branch1 file" files: file file-branch1 | |
| 20 |/ | |
| 21 o 0 "Initial add" files: file | |
| 22 | |
| 23 % manifest of tip | |
| 24 644 file | |
| 25 644 file-branch1 | |
| 26 644 file-branch2 | |
| 27 644 file-parent |