Mercurial > hg
view tests/test-mq-caches.out @ 4115:c95060a5391a
merge: fix renaming of subdirectories under renamed directories
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 27 Feb 2007 16:20:06 -0600 |
parents | fbf8320f25c8 |
children | bbfe5a3fc80c |
line wrap: on
line source
# mq patch on an empty repo tip: 0 No .hg/branches.cache tip: 0 No .hg/branches.cache # some regular revisions 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 Patch queue now empty applying p0 applying p1 applying p2 Now at: p2 tip: 3 9539f35bdc80732cc9a3f84e46508f1ed1ec8cff 0 9539f35bdc80732cc9a3f84e46508f1ed1ec8cff foo