Mercurial Mercurial > hg / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-convert-mtn-rename-directory.out
author Patrick Mezard <patrick@mezard.eu>
Tue, 31 Jul 2012 17:39:32 +0200
branchstable
changeset 17319 a189d4470a34
parent 7957 88a2687fbd38
permissions -rw-r--r--
transplant: handle non-empty patches doing nothing (issue2806) If patch.patch() reports patched files when applying a changeset and the following commit says nothing changed, transplant used to abort with a RuntimeError, assuming something went wrong with patching. The mismatch is patch.patch() reports patched files, not changed ones. It could be modified to report changed files but it means duplicating work from status, may be expensive in the case of binary files, and is probably not that useful at API level. For instance, if two patches are applied on the working directory, the outcome may be nothing changed while each call would have returned modified files. The caller would have to call status() itself again. This patch fixes the issue by trusting patching code: if the patch succeeded and commit reports nothing changed, then nothing changed, patch() did not "dropped changes on the floor".
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
Mercurial