Mercurial > hg
view tests/test-mq-caches.out @ 9552:f0417b6ff98a
Merge with -stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 08 Oct 2009 00:59:46 -0500 |
parents | 561ff8d9e4f0 |
children |
line wrap: on
line source
# mq patch on an empty repo tip: 0 No branch cache tip: 0 No branch cache # some regular revisions popping p1 patch queue now empty tip: 1 3f910abad313ff802d3a23a7529433872df9b3ae 1 3f910abad313ff802d3a23a7529433872df9b3ae bar 9539f35bdc80732cc9a3f84e46508f1ed1ec8cff foo # add some mq patches applying p1 now at: p1 tip: 2 3f910abad313ff802d3a23a7529433872df9b3ae 1 3f910abad313ff802d3a23a7529433872df9b3ae bar 9539f35bdc80732cc9a3f84e46508f1ed1ec8cff foo tip: 3 3f910abad313ff802d3a23a7529433872df9b3ae 1 3f910abad313ff802d3a23a7529433872df9b3ae bar 9539f35bdc80732cc9a3f84e46508f1ed1ec8cff foo branch foo: 3 branch bar: 2 # removing the cache tip: 3 3f910abad313ff802d3a23a7529433872df9b3ae 1 3f910abad313ff802d3a23a7529433872df9b3ae bar 9539f35bdc80732cc9a3f84e46508f1ed1ec8cff foo branch foo: 3 branch bar: 2 # importing rev 1 (the cache now ends in one of the patches) tip: 3 3f910abad313ff802d3a23a7529433872df9b3ae 1 3f910abad313ff802d3a23a7529433872df9b3ae bar 9539f35bdc80732cc9a3f84e46508f1ed1ec8cff foo branch foo: 3 branch bar: 2 qbase: 1 # detect an invalid cache popping p2 popping p1 popping p0 patch queue now empty applying p0 applying p1 applying p2 now at: p2 tip: 3 9539f35bdc80732cc9a3f84e46508f1ed1ec8cff 0 9539f35bdc80732cc9a3f84e46508f1ed1ec8cff foo