Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-mq-caches.out @ 3486:fbf8320f25c8
make mq play nicely with the branch cache
- if no patches are applied, don't do anything different
- if the cache includes valid data from one of the patch revisions,
use the cache, but don't save anything new
- if the cache has data from before the patch revisions only,
save what the list of branches would be without the patch revisions
| author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
|---|---|
| date | Mon, 23 Oct 2006 23:32:56 -0300 |
| parents | |
| children | bbfe5a3fc80c |
comparison
equal
deleted
inserted
replaced
| 3485:23cffef5d424 | 3486:fbf8320f25c8 |
|---|---|
| 1 # mq patch on an empty repo | |
| 2 tip: 0 | |
| 3 No .hg/branches.cache | |
| 4 tip: 0 | |
| 5 No .hg/branches.cache | |
| 6 | |
| 7 # some regular revisions | |
| 8 Patch queue now empty | |
| 9 tip: 1 | |
| 10 3f910abad313ff802d3a23a7529433872df9b3ae 1 | |
| 11 3f910abad313ff802d3a23a7529433872df9b3ae bar | |
| 12 9539f35bdc80732cc9a3f84e46508f1ed1ec8cff foo | |
| 13 | |
| 14 # add some mq patches | |
| 15 applying p1 | |
| 16 Now at: p1 | |
| 17 tip: 2 | |
| 18 3f910abad313ff802d3a23a7529433872df9b3ae 1 | |
| 19 3f910abad313ff802d3a23a7529433872df9b3ae bar | |
| 20 9539f35bdc80732cc9a3f84e46508f1ed1ec8cff foo | |
| 21 tip: 3 | |
| 22 3f910abad313ff802d3a23a7529433872df9b3ae 1 | |
| 23 3f910abad313ff802d3a23a7529433872df9b3ae bar | |
| 24 9539f35bdc80732cc9a3f84e46508f1ed1ec8cff foo | |
| 25 branch foo: 3 | |
| 26 branch bar: 2 | |
| 27 | |
| 28 # removing the cache | |
| 29 tip: 3 | |
| 30 3f910abad313ff802d3a23a7529433872df9b3ae 1 | |
| 31 3f910abad313ff802d3a23a7529433872df9b3ae bar | |
| 32 9539f35bdc80732cc9a3f84e46508f1ed1ec8cff foo | |
| 33 branch foo: 3 | |
| 34 branch bar: 2 | |
| 35 | |
| 36 # importing rev 1 (the cache now ends in one of the patches) | |
| 37 tip: 3 | |
| 38 3f910abad313ff802d3a23a7529433872df9b3ae 1 | |
| 39 3f910abad313ff802d3a23a7529433872df9b3ae bar | |
| 40 9539f35bdc80732cc9a3f84e46508f1ed1ec8cff foo | |
| 41 branch foo: 3 | |
| 42 branch bar: 2 | |
| 43 qbase: 1 | |
| 44 | |
| 45 # detect an invalid cache | |
| 46 Patch queue now empty | |
| 47 applying p0 | |
| 48 applying p1 | |
| 49 applying p2 | |
| 50 Now at: p2 | |
| 51 tip: 3 | |
| 52 9539f35bdc80732cc9a3f84e46508f1ed1ec8cff 0 | |
| 53 9539f35bdc80732cc9a3f84e46508f1ed1ec8cff foo |