comparison tests/test-convert-bzr-114.t @ 23048:ee5f834077be stable

merge default into stable for 3.2 freeze
author Matt Mackall <mpm@selenic.com>
date Sat, 18 Oct 2014 18:04:31 -0500
parents 7a9cbb315d84
children 89872688893f
comparison
equal deleted inserted replaced
22843:b6531d806de8 23048:ee5f834077be
1 #require bzr114
1 2
2 $ "$TESTDIR/hghave" bzr114 || exit 80
3 $ . "$TESTDIR/bzr-definitions" 3 $ . "$TESTDIR/bzr-definitions"
4 4
5 The file/directory replacement can only be reproduced on 5 The file/directory replacement can only be reproduced on
6 bzr >= 1.4. Merge it back in test-convert-bzr-directories once 6 bzr >= 1.4. Merge it back in test-convert-bzr-directories once
7 this version becomes mainstream. 7 this version becomes mainstream.