611
611
bundle = self.get_valid_bundle('a@cset-0-5', 'a@cset-0-6')
612
612
other = self.get_checkout('a@cset-0-5')
613
616
other.rename_one('sub/dir/nolastnewline.txt', 'sub/nolastnewline.txt')
614
617
other.commit('rename file', rev_id='a@cset-0-6b')
615
618
merge([other.basedir, -1], [None, None], this_dir=self.tree1.basedir)