Mercurial Mercurial > hg-stable / 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 Matt Mackall <mpm@selenic.com>
Sat, 22 Oct 2011 16:12:33 -0500
branchstable
changeset 15337 cf5f9df6406b
parent 7957 88a2687fbd38
permissions -rw-r--r--
windows: recompute flags when committing a merge (issue1802) Before this patch, Windows always did the wrong thing with exec bits when committing a merge: consult the flags in first parent. Now we manually recompute the result of merging flags at commit time, which almost always does the right thing (except when there are conflicts between symlink and exec flags). To do this, we: - pull flag synthesis out into its own function - delay building this function unless it's needed - add a merge case that compares flags in local and other against the ancestor This has been tested in multiple ways on Linux: - running the whole test suite with both old and new code in place, checking for differences in each flags() result - running the whole test suite while comparing real on-disk flags against synthetic ones for merges - test-issue1802 (from Martin Geisler) which disables exec bit checking on Unix
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
hg-stable