Mercurial > hg
view tests/test-convert-bzr-directories @ 12382:28ddf67198b2 stable
log: include unmodified-in-merge files in log diff/stat (issue2383)
f786fc4b8764 assumed that walkchangerevs called prep with all relevant matched
filenames, but actually it only contains the names of files changed in the
relevant changeset. That meant that log diff/stat of merges missed the diff for
files only changed in the other branch.
This is a minimal fix for making sure we only use fns when we are following and
thus will have problems with merges anyway ...
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Thu, 23 Sep 2010 01:23:16 +0200 |
parents | 9e6d6568bf7a |
children |
line wrap: on
line source
#!/bin/sh . "$TESTDIR/bzr-definitions" echo % empty directory mkdir test-empty cd test-empty bzr init -q source cd source echo content > a bzr add -q a bzr commit -q -m 'Initial add' mkdir empty bzr add -q empty bzr commit -q -m 'Empty directory added' echo content > empty/something bzr add -q empty/something bzr commit -q -m 'Added file into directory' cd .. hg convert source source-hg manifest source-hg 1 manifest source-hg tip cd .. echo % directory renames mkdir test-dir-rename cd test-dir-rename bzr init -q source cd source mkdir tpyo echo content > tpyo/something bzr add -q tpyo bzr commit -q -m 'Added directory' bzr mv tpyo typo bzr commit -q -m 'Oops, typo' cd .. hg convert source source-hg manifest source-hg 0 manifest source-hg tip cd .. echo % nested directory renames mkdir test-nested-dir-rename cd test-nested-dir-rename bzr init -q source cd source mkdir -p firstlevel/secondlevel/thirdlevel echo content > firstlevel/secondlevel/file echo this_needs_to_be_there_too > firstlevel/secondlevel/thirdlevel/stuff bzr add -q firstlevel bzr commit -q -m 'Added nested directories' bzr mv firstlevel/secondlevel secondlevel bzr commit -q -m 'Moved secondlevel one level up' cd .. hg convert source source-hg manifest source-hg tip cd .. echo % directory remove mkdir test-dir-remove cd test-dir-remove bzr init -q source cd source mkdir src echo content > src/sourcecode bzr add -q src bzr commit -q -m 'Added directory' bzr rm -q src bzr commit -q -m 'Removed directory' cd .. hg convert source source-hg manifest source-hg 0 manifest source-hg tip cd .. echo % directory replace mkdir test-dir-replace cd test-dir-replace bzr init -q source cd source mkdir first second echo content > first/file echo morecontent > first/dummy echo othercontent > second/something bzr add -q first second bzr commit -q -m 'Initial layout' bzr mv first/file second/file bzr mv first third bzr commit -q -m 'Some conflicting moves' cd .. hg convert source source-hg manifest source-hg tip cd ..