annotate tests/test-convert-mtn-rename-directory.out @ 9827:4fe9ca519637

mdiff: fix diff -b/B/w on mixed whitespace hunks (issue127) Previous code was computing hunks then checking if these hunks could be ignored when taking whitespace/blank-lines options in accounts. This approach is simple but fails with hunks containing both whitespace and non-whitespace changes, the whole hunk is emitted while it can be mostly made of whitespace. The new version normalize the whitespaces before hunk generation, and test for blank-lines afterwards.
author Patrick Mezard <pmezard@gmail.com>
date Wed, 11 Nov 2009 18:31:42 +0100
parents 88a2687fbd38
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
7957
88a2687fbd38 right way to check if file was in renamed directory, fixes import monotone
Pavel Volkovitskiy <int@mtx.ru>
parents:
diff changeset
1 % tedious monotone keys configuration
88a2687fbd38 right way to check if file was in renamed directory, fixes import monotone
Pavel Volkovitskiy <int@mtx.ru>
parents:
diff changeset
2 % create monotone repository
88a2687fbd38 right way to check if file was in renamed directory, fixes import monotone
Pavel Volkovitskiy <int@mtx.ru>
parents:
diff changeset
3 mtn: adding dir1 to workspace manifest
88a2687fbd38 right way to check if file was in renamed directory, fixes import monotone
Pavel Volkovitskiy <int@mtx.ru>
parents:
diff changeset
4 mtn: adding dir1/subdir1 to workspace manifest
88a2687fbd38 right way to check if file was in renamed directory, fixes import monotone
Pavel Volkovitskiy <int@mtx.ru>
parents:
diff changeset
5 mtn: adding dir1/subdir1/file1 to workspace manifest
88a2687fbd38 right way to check if file was in renamed directory, fixes import monotone
Pavel Volkovitskiy <int@mtx.ru>
parents:
diff changeset
6 mtn: beginning commit on branch 'com.selenic.test'
88a2687fbd38 right way to check if file was in renamed directory, fixes import monotone
Pavel Volkovitskiy <int@mtx.ru>
parents:
diff changeset
7 mtn: committed revision 5ed13ff5582d8d1e319f079b694a37d2b45edfc8
88a2687fbd38 right way to check if file was in renamed directory, fixes import monotone
Pavel Volkovitskiy <int@mtx.ru>
parents:
diff changeset
8 % rename directory
88a2687fbd38 right way to check if file was in renamed directory, fixes import monotone
Pavel Volkovitskiy <int@mtx.ru>
parents:
diff changeset
9 mtn: skipping dir1, already accounted for in workspace
88a2687fbd38 right way to check if file was in renamed directory, fixes import monotone
Pavel Volkovitskiy <int@mtx.ru>
parents:
diff changeset
10 mtn: renaming dir1/subdir1 to dir1/subdir2 in workspace manifest
88a2687fbd38 right way to check if file was in renamed directory, fixes import monotone
Pavel Volkovitskiy <int@mtx.ru>
parents:
diff changeset
11 mtn: beginning commit on branch 'com.selenic.test'
88a2687fbd38 right way to check if file was in renamed directory, fixes import monotone
Pavel Volkovitskiy <int@mtx.ru>
parents:
diff changeset
12 mtn: committed revision 985204142a822b22ee86b509d61f3c5ab6857d2b
88a2687fbd38 right way to check if file was in renamed directory, fixes import monotone
Pavel Volkovitskiy <int@mtx.ru>
parents:
diff changeset
13 % convert
88a2687fbd38 right way to check if file was in renamed directory, fixes import monotone
Pavel Volkovitskiy <int@mtx.ru>
parents:
diff changeset
14 assuming destination repo.mtn-hg
88a2687fbd38 right way to check if file was in renamed directory, fixes import monotone
Pavel Volkovitskiy <int@mtx.ru>
parents:
diff changeset
15 initializing destination repo.mtn-hg repository
88a2687fbd38 right way to check if file was in renamed directory, fixes import monotone
Pavel Volkovitskiy <int@mtx.ru>
parents:
diff changeset
16 scanning source...
88a2687fbd38 right way to check if file was in renamed directory, fixes import monotone
Pavel Volkovitskiy <int@mtx.ru>
parents:
diff changeset
17 sorting...
88a2687fbd38 right way to check if file was in renamed directory, fixes import monotone
Pavel Volkovitskiy <int@mtx.ru>
parents:
diff changeset
18 converting...
88a2687fbd38 right way to check if file was in renamed directory, fixes import monotone
Pavel Volkovitskiy <int@mtx.ru>
parents:
diff changeset
19 1 initialize
88a2687fbd38 right way to check if file was in renamed directory, fixes import monotone
Pavel Volkovitskiy <int@mtx.ru>
parents:
diff changeset
20 0 rename
88a2687fbd38 right way to check if file was in renamed directory, fixes import monotone
Pavel Volkovitskiy <int@mtx.ru>
parents:
diff changeset
21 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
88a2687fbd38 right way to check if file was in renamed directory, fixes import monotone
Pavel Volkovitskiy <int@mtx.ru>
parents:
diff changeset
22 % manifest
88a2687fbd38 right way to check if file was in renamed directory, fixes import monotone
Pavel Volkovitskiy <int@mtx.ru>
parents:
diff changeset
23 dir1/subdir2/file1