Mercurial > hg
comparison tests/test-convert-bzr.out @ 8165:78658990c725
convert/bzr: make it work with filemaps (issue1631)
The bzr converter maintains a child -> parents mapping and drop entries
whenever a child is read. It does not work with filemaps, getchangedfiles() may
be called more than once when filtered files belong to merge revisions.
getchanges() still works that way but it is not clear whether a similar issue
can arise when interacting with merges.
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Sun, 26 Apr 2009 11:35:53 +0200 |
| parents | adce97d28389 |
| children | 7a0fcdd3828f eb7be0e752d9 |
comparison
equal
deleted
inserted
replaced
| 8148:adce97d28389 | 8165:78658990c725 |
|---|---|
| 23 sorting... | 23 sorting... |
| 24 converting... | 24 converting... |
| 25 0 Initial add: a, c, e | 25 0 Initial add: a, c, e |
| 26 o 0 "Initial add: a, c, e" files: a c e | 26 o 0 "Initial add: a, c, e" files: a c e |
| 27 | 27 |
| 28 % test with filemap | |
| 29 initializing destination source-filemap-hg repository | |
| 30 scanning source... | |
| 31 sorting... | |
| 32 converting... | |
| 33 1 Initial add: a, c, e | |
| 34 0 rename a into b, create a, rename c into d | |
| 35 b | |
| 36 d | |
| 37 f | |
| 28 % merge | 38 % merge |
| 29 initializing destination source-hg repository | 39 initializing destination source-hg repository |
| 30 scanning source... | 40 scanning source... |
| 31 sorting... | 41 sorting... |
| 32 converting... | 42 converting... |