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.out
author Brodie Rao <me+hg@dackz.net>
Tue, 30 Jun 2009 17:58:17 -0400
changeset 8982 9c0cecb71350
parent 8124 d883bfbd2e60
permissions -rw-r--r--
zsh completion: disable defaults and verbose output when completing If ui.verbose is set to True in hgrc, commands used to provide completions would yield bad results. For example, qpush completion would include the patch numbers and statuses as returned by qunapplied -v, instead of just the patch names. Defaults are also disabled when completing to prevent similar issues when an option is set that changes a command's output.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
6372
8f79820443a4 Add a test for monotone conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
     1
 
% tedious monotone keys configuration
8f79820443a4 Add a test for monotone conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
     2
 
% create monotone repository
8f79820443a4 Add a test for monotone conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
     3
 
mtn: adding a to workspace manifest
8f79820443a4 Add a test for monotone conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
     4
 
mtn: adding bin to workspace manifest
8f79820443a4 Add a test for monotone conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
     5
 
mtn: adding c to workspace manifest
8f79820443a4 Add a test for monotone conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
     6
 
mtn: adding dir to workspace manifest
8f79820443a4 Add a test for monotone conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
     7
 
mtn: adding dir/b to workspace manifest
8099
3cdf4872941a convert/mtn: handle new files in moved directories (issue1619)
Patrick Mezard <pmezard@gmail.com>
parents: 8050
diff changeset 
     8
 
mtn: adding dir/d to workspace manifest
6372
8f79820443a4 Add a test for monotone conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
     9
 
mtn: beginning commit on branch 'com.selenic.test'
8099
3cdf4872941a convert/mtn: handle new files in moved directories (issue1619)
Patrick Mezard <pmezard@gmail.com>
parents: 8050
diff changeset 
    10
 
mtn: committed revision 0f6e5e4f2e7d2a8ef312408f57618abf026afd90
6372
8f79820443a4 Add a test for monotone conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    11
 
% update monotone working directory
8f79820443a4 Add a test for monotone conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    12
 
mtn: skipping dir, already accounted for in workspace
8f79820443a4 Add a test for monotone conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    13
 
mtn: renaming a to dir/a in workspace manifest
8f79820443a4 Add a test for monotone conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    14
 
mtn: dropping c from workspace manifest
8f79820443a4 Add a test for monotone conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    15
 
mtn: beginning commit on branch 'com.selenic.test'
8099
3cdf4872941a convert/mtn: handle new files in moved directories (issue1619)
Patrick Mezard <pmezard@gmail.com>
parents: 8050
diff changeset 
    16
 
mtn: committed revision 51d0a982464573a2a2cf5ee2c9219c652aaebeff
6372
8f79820443a4 Add a test for monotone conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    17
 
% convert once
8f79820443a4 Add a test for monotone conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    18
 
assuming destination repo.mtn-hg
8f79820443a4 Add a test for monotone conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    19
 
initializing destination repo.mtn-hg repository
8f79820443a4 Add a test for monotone conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    20
 
scanning source...
8f79820443a4 Add a test for monotone conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    21
 
sorting...
8f79820443a4 Add a test for monotone conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    22
 
converting...
8f79820443a4 Add a test for monotone conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    23
 
1 initialize
8f79820443a4 Add a test for monotone conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    24
 
0 update1
8f79820443a4 Add a test for monotone conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    25
 
mtn: adding e to workspace manifest
8f79820443a4 Add a test for monotone conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    26
 
mtn: dropping dir/b from workspace manifest
8f79820443a4 Add a test for monotone conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    27
 
mtn: renaming bin to bin2 in workspace manifest
8f79820443a4 Add a test for monotone conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    28
 
mtn: beginning commit on branch 'com.selenic.test'
8099
3cdf4872941a convert/mtn: handle new files in moved directories (issue1619)
Patrick Mezard <pmezard@gmail.com>
parents: 8050
diff changeset 
    29
 
mtn: committed revision ebe58335d85d8cb176b6d0a12be04f5314b998da
8050
087cc65bebff convert/mtn: record changes from directory renames (issue1587)
Patrick Mezard <pmezard@gmail.com>
parents: 6873
diff changeset 
    30
 
% test directory move
087cc65bebff convert/mtn: record changes from directory renames (issue1587)
Patrick Mezard <pmezard@gmail.com>
parents: 6873
diff changeset 
    31
 
mtn: adding dir1 to workspace manifest
087cc65bebff convert/mtn: record changes from directory renames (issue1587)
Patrick Mezard <pmezard@gmail.com>
parents: 6873
diff changeset 
    32
 
mtn: adding dir1/subdir1 to workspace manifest
087cc65bebff convert/mtn: record changes from directory renames (issue1587)
Patrick Mezard <pmezard@gmail.com>
parents: 6873
diff changeset 
    33
 
mtn: adding dir1/subdir1/file1 to workspace manifest
087cc65bebff convert/mtn: record changes from directory renames (issue1587)
Patrick Mezard <pmezard@gmail.com>
parents: 6873
diff changeset 
    34
 
mtn: adding dir1/subdir2_other to workspace manifest
087cc65bebff convert/mtn: record changes from directory renames (issue1587)
Patrick Mezard <pmezard@gmail.com>
parents: 6873
diff changeset 
    35
 
mtn: adding dir1/subdir2_other/file1 to workspace manifest
087cc65bebff convert/mtn: record changes from directory renames (issue1587)
Patrick Mezard <pmezard@gmail.com>
parents: 6873
diff changeset 
    36
 
mtn: beginning commit on branch 'com.selenic.test'
8099
3cdf4872941a convert/mtn: handle new files in moved directories (issue1619)
Patrick Mezard <pmezard@gmail.com>
parents: 8050
diff changeset 
    37
 
mtn: committed revision a8d62bc04fee4d2936d28e98bbcc81686dd74306
8050
087cc65bebff convert/mtn: record changes from directory renames (issue1587)
Patrick Mezard <pmezard@gmail.com>
parents: 6873
diff changeset 
    38
 
mtn: skipping dir1, already accounted for in workspace
087cc65bebff convert/mtn: record changes from directory renames (issue1587)
Patrick Mezard <pmezard@gmail.com>
parents: 6873
diff changeset 
    39
 
mtn: renaming dir1/subdir1 to dir1/subdir2 in workspace manifest
087cc65bebff convert/mtn: record changes from directory renames (issue1587)
Patrick Mezard <pmezard@gmail.com>
parents: 6873
diff changeset 
    40
 
mtn: beginning commit on branch 'com.selenic.test'
8099
3cdf4872941a convert/mtn: handle new files in moved directories (issue1619)
Patrick Mezard <pmezard@gmail.com>
parents: 8050
diff changeset 
    41
 
mtn: committed revision 2c3d241bbbfe538b1b51d910f5676407e3f4d3a6
8050
087cc65bebff convert/mtn: record changes from directory renames (issue1587)
Patrick Mezard <pmezard@gmail.com>
parents: 6873
diff changeset 
    42
 
% test subdirectory move
6377
2cf67d007f41 test-convert-mtn: test directory move
Patrick Mezard <pmezard@gmail.com>
parents: 6376
diff changeset 
    43
 
mtn: renaming dir to dir2 in workspace manifest
8099
3cdf4872941a convert/mtn: handle new files in moved directories (issue1619)
Patrick Mezard <pmezard@gmail.com>
parents: 8050
diff changeset 
    44
 
mtn: dropping dir2/d from workspace manifest
3cdf4872941a convert/mtn: handle new files in moved directories (issue1619)
Patrick Mezard <pmezard@gmail.com>
parents: 8050
diff changeset 
    45
 
mtn: adding dir2/newfile to workspace manifest
6377
2cf67d007f41 test-convert-mtn: test directory move
Patrick Mezard <pmezard@gmail.com>
parents: 6376
diff changeset 
    46
 
mtn: beginning commit on branch 'com.selenic.test'
8099
3cdf4872941a convert/mtn: handle new files in moved directories (issue1619)
Patrick Mezard <pmezard@gmail.com>
parents: 8050
diff changeset 
    47
 
mtn: committed revision fdb5a02dae8bfce3a79b3393680af471016e1b4c
6396
18eeabae6148 test-convert-mtn: test directory deletion
Patrick Mezard <pmezard@gmail.com>
parents: 6377
diff changeset 
    48
 
mtn: beginning commit on branch 'com.selenic.test'
8099
3cdf4872941a convert/mtn: handle new files in moved directories (issue1619)
Patrick Mezard <pmezard@gmail.com>
parents: 8050
diff changeset 
    49
 
mtn: committed revision 8bbf76d717001d24964e4604739fdcd0f539fc88
6396
18eeabae6148 test-convert-mtn: test directory deletion
Patrick Mezard <pmezard@gmail.com>
parents: 6377
diff changeset 
    50
 
mtn: dropping dir2/dir/subdir/f from workspace manifest
18eeabae6148 test-convert-mtn: test directory deletion
Patrick Mezard <pmezard@gmail.com>
parents: 6377
diff changeset 
    51
 
mtn: dropping dir2/dir/subdir from workspace manifest
18eeabae6148 test-convert-mtn: test directory deletion
Patrick Mezard <pmezard@gmail.com>
parents: 6377
diff changeset 
    52
 
mtn: dropping dir2/dir/emptydir from workspace manifest
18eeabae6148 test-convert-mtn: test directory deletion
Patrick Mezard <pmezard@gmail.com>
parents: 6377
diff changeset 
    53
 
mtn: dropping dir2/dir from workspace manifest
18eeabae6148 test-convert-mtn: test directory deletion
Patrick Mezard <pmezard@gmail.com>
parents: 6377
diff changeset 
    54
 
mtn: beginning commit on branch 'com.selenic.test'
8099
3cdf4872941a convert/mtn: handle new files in moved directories (issue1619)
Patrick Mezard <pmezard@gmail.com>
parents: 8050
diff changeset 
    55
 
mtn: committed revision 2323d4bc324e6c82628dc04d47a9fd32ad24e322
8123
933b874e402f convert/mtn: handle files moved in a moved directory (issue1619/2)
Patrick Mezard <pmezard@gmail.com>
parents: 8099
diff changeset 
    56
 
% test directory and file move
933b874e402f convert/mtn: handle files moved in a moved directory (issue1619/2)
Patrick Mezard <pmezard@gmail.com>
parents: 8099
diff changeset 
    57
 
mtn: adding dir3 to workspace manifest
933b874e402f convert/mtn: handle files moved in a moved directory (issue1619/2)
Patrick Mezard <pmezard@gmail.com>
parents: 8099
diff changeset 
    58
 
mtn: adding dir3/a to workspace manifest
933b874e402f convert/mtn: handle files moved in a moved directory (issue1619/2)
Patrick Mezard <pmezard@gmail.com>
parents: 8099
diff changeset 
    59
 
mtn: adding dir3/d1 to workspace manifest
933b874e402f convert/mtn: handle files moved in a moved directory (issue1619/2)
Patrick Mezard <pmezard@gmail.com>
parents: 8099
diff changeset 
    60
 
mtn: beginning commit on branch 'com.selenic.test'
933b874e402f convert/mtn: handle files moved in a moved directory (issue1619/2)
Patrick Mezard <pmezard@gmail.com>
parents: 8099
diff changeset 
    61
 
mtn: committed revision 47b192f720faa622f48c68d1eb075b26d405aa8b
933b874e402f convert/mtn: handle files moved in a moved directory (issue1619/2)
Patrick Mezard <pmezard@gmail.com>
parents: 8099
diff changeset 
    62
 
mtn: skipping dir3/d1, already accounted for in workspace
933b874e402f convert/mtn: handle files moved in a moved directory (issue1619/2)
Patrick Mezard <pmezard@gmail.com>
parents: 8099
diff changeset 
    63
 
mtn: renaming dir3/a to dir3/d1/a in workspace manifest
933b874e402f convert/mtn: handle files moved in a moved directory (issue1619/2)
Patrick Mezard <pmezard@gmail.com>
parents: 8099
diff changeset 
    64
 
mtn: skipping dir3, already accounted for in workspace
933b874e402f convert/mtn: handle files moved in a moved directory (issue1619/2)
Patrick Mezard <pmezard@gmail.com>
parents: 8099
diff changeset 
    65
 
mtn: renaming dir3/d1 to dir3/d2 in workspace manifest
933b874e402f convert/mtn: handle files moved in a moved directory (issue1619/2)
Patrick Mezard <pmezard@gmail.com>
parents: 8099
diff changeset 
    66
 
mtn: beginning commit on branch 'com.selenic.test'
933b874e402f convert/mtn: handle files moved in a moved directory (issue1619/2)
Patrick Mezard <pmezard@gmail.com>
parents: 8099
diff changeset 
    67
 
mtn: committed revision 8b543a400d3ee7f6d4bb1835b9b9e3747c8cb632
8124
d883bfbd2e60 convert/mtn: handle directory move into moved directory (issue1619/3)
Patrick Mezard <pmezard@gmail.com>
parents: 8123
diff changeset 
    68
 
% test directory move into another directory move
d883bfbd2e60 convert/mtn: handle directory move into moved directory (issue1619/3)
Patrick Mezard <pmezard@gmail.com>
parents: 8123
diff changeset 
    69
 
mtn: adding dir4 to workspace manifest
d883bfbd2e60 convert/mtn: handle directory move into moved directory (issue1619/3)
Patrick Mezard <pmezard@gmail.com>
parents: 8123
diff changeset 
    70
 
mtn: adding dir4/a to workspace manifest
d883bfbd2e60 convert/mtn: handle directory move into moved directory (issue1619/3)
Patrick Mezard <pmezard@gmail.com>
parents: 8123
diff changeset 
    71
 
mtn: adding dir5 to workspace manifest
d883bfbd2e60 convert/mtn: handle directory move into moved directory (issue1619/3)
Patrick Mezard <pmezard@gmail.com>
parents: 8123
diff changeset 
    72
 
mtn: beginning commit on branch 'com.selenic.test'
d883bfbd2e60 convert/mtn: handle directory move into moved directory (issue1619/3)
Patrick Mezard <pmezard@gmail.com>
parents: 8123
diff changeset 
    73
 
mtn: committed revision 466e0b2afc7a55aa2b4ab2f57cb240bb6cd66fc7
d883bfbd2e60 convert/mtn: handle directory move into moved directory (issue1619/3)
Patrick Mezard <pmezard@gmail.com>
parents: 8123
diff changeset 
    74
 
mtn: renaming dir5 to dir6 in workspace manifest
d883bfbd2e60 convert/mtn: handle directory move into moved directory (issue1619/3)
Patrick Mezard <pmezard@gmail.com>
parents: 8123
diff changeset 
    75
 
mtn: skipping dir6, already accounted for in workspace
d883bfbd2e60 convert/mtn: handle directory move into moved directory (issue1619/3)
Patrick Mezard <pmezard@gmail.com>
parents: 8123
diff changeset 
    76
 
mtn: renaming dir4 to dir6/dir4 in workspace manifest
d883bfbd2e60 convert/mtn: handle directory move into moved directory (issue1619/3)
Patrick Mezard <pmezard@gmail.com>
parents: 8123
diff changeset 
    77
 
mtn: beginning commit on branch 'com.selenic.test'
d883bfbd2e60 convert/mtn: handle directory move into moved directory (issue1619/3)
Patrick Mezard <pmezard@gmail.com>
parents: 8123
diff changeset 
    78
 
mtn: committed revision 3d1f77ebad0c23a5d14911be3b670f990991b749
d883bfbd2e60 convert/mtn: handle directory move into moved directory (issue1619/3)
Patrick Mezard <pmezard@gmail.com>
parents: 8123
diff changeset 
    79
 
% test diverging directory moves
d883bfbd2e60 convert/mtn: handle directory move into moved directory (issue1619/3)
Patrick Mezard <pmezard@gmail.com>
parents: 8123
diff changeset 
    80
 
mtn: adding dir7 to workspace manifest
d883bfbd2e60 convert/mtn: handle directory move into moved directory (issue1619/3)
Patrick Mezard <pmezard@gmail.com>
parents: 8123
diff changeset 
    81
 
mtn: adding dir7/c to workspace manifest
d883bfbd2e60 convert/mtn: handle directory move into moved directory (issue1619/3)
Patrick Mezard <pmezard@gmail.com>
parents: 8123
diff changeset 
    82
 
mtn: adding dir7/dir9 to workspace manifest
d883bfbd2e60 convert/mtn: handle directory move into moved directory (issue1619/3)
Patrick Mezard <pmezard@gmail.com>
parents: 8123
diff changeset 
    83
 
mtn: adding dir7/dir9/b to workspace manifest
d883bfbd2e60 convert/mtn: handle directory move into moved directory (issue1619/3)
Patrick Mezard <pmezard@gmail.com>
parents: 8123
diff changeset 
    84
 
mtn: adding dir7/dir9/dir8 to workspace manifest
d883bfbd2e60 convert/mtn: handle directory move into moved directory (issue1619/3)
Patrick Mezard <pmezard@gmail.com>
parents: 8123
diff changeset 
    85
 
mtn: adding dir7/dir9/dir8/a to workspace manifest
d883bfbd2e60 convert/mtn: handle directory move into moved directory (issue1619/3)
Patrick Mezard <pmezard@gmail.com>
parents: 8123
diff changeset 
    86
 
mtn: beginning commit on branch 'com.selenic.test'
d883bfbd2e60 convert/mtn: handle directory move into moved directory (issue1619/3)
Patrick Mezard <pmezard@gmail.com>
parents: 8123
diff changeset 
    87
 
mtn: committed revision 08a08511f18b428d840199b062de90d0396bc2ed
d883bfbd2e60 convert/mtn: handle directory move into moved directory (issue1619/3)
Patrick Mezard <pmezard@gmail.com>
parents: 8123
diff changeset 
    88
 
mtn: renaming dir7 to dir7-2 in workspace manifest
d883bfbd2e60 convert/mtn: handle directory move into moved directory (issue1619/3)
Patrick Mezard <pmezard@gmail.com>
parents: 8123
diff changeset 
    89
 
mtn: renaming dir7-2/dir9 to dir9-2 in workspace manifest
d883bfbd2e60 convert/mtn: handle directory move into moved directory (issue1619/3)
Patrick Mezard <pmezard@gmail.com>
parents: 8123
diff changeset 
    90
 
mtn: renaming dir9-2/dir8 to dir8-2 in workspace manifest
d883bfbd2e60 convert/mtn: handle directory move into moved directory (issue1619/3)
Patrick Mezard <pmezard@gmail.com>
parents: 8123
diff changeset 
    91
 
mtn: beginning commit on branch 'com.selenic.test'
d883bfbd2e60 convert/mtn: handle directory move into moved directory (issue1619/3)
Patrick Mezard <pmezard@gmail.com>
parents: 8123
diff changeset 
    92
 
mtn: committed revision 4a736634505795f17786fffdf2c9cbf5b11df6f6
6372
8f79820443a4 Add a test for monotone conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    93
 
% convert incrementally
8f79820443a4 Add a test for monotone conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    94
 
assuming destination repo.mtn-hg
8f79820443a4 Add a test for monotone conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    95
 
scanning source...
8f79820443a4 Add a test for monotone conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    96
 
sorting...
8f79820443a4 Add a test for monotone conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    97
 
converting...
8124
d883bfbd2e60 convert/mtn: handle directory move into moved directory (issue1619/3)
Patrick Mezard <pmezard@gmail.com>
parents: 8123
diff changeset 
    98
 
11 update2 "with" quotes
d883bfbd2e60 convert/mtn: handle directory move into moved directory (issue1619/3)
Patrick Mezard <pmezard@gmail.com>
parents: 8123
diff changeset 
    99
 
10 createdir1
d883bfbd2e60 convert/mtn: handle directory move into moved directory (issue1619/3)
Patrick Mezard <pmezard@gmail.com>
parents: 8123
diff changeset 
   100
 
9 movedir1
d883bfbd2e60 convert/mtn: handle directory move into moved directory (issue1619/3)
Patrick Mezard <pmezard@gmail.com>
parents: 8123
diff changeset 
   101
 
8 movedir
d883bfbd2e60 convert/mtn: handle directory move into moved directory (issue1619/3)
Patrick Mezard <pmezard@gmail.com>
parents: 8123
diff changeset 
   102
 
7 emptydir
d883bfbd2e60 convert/mtn: handle directory move into moved directory (issue1619/3)
Patrick Mezard <pmezard@gmail.com>
parents: 8123
diff changeset 
   103
 
6 dropdirectory
d883bfbd2e60 convert/mtn: handle directory move into moved directory (issue1619/3)
Patrick Mezard <pmezard@gmail.com>
parents: 8123
diff changeset 
   104
 
5 dirfilemove
d883bfbd2e60 convert/mtn: handle directory move into moved directory (issue1619/3)
Patrick Mezard <pmezard@gmail.com>
parents: 8123
diff changeset 
   105
 
4 dirfilemove2
d883bfbd2e60 convert/mtn: handle directory move into moved directory (issue1619/3)
Patrick Mezard <pmezard@gmail.com>
parents: 8123
diff changeset 
   106
 
3 dirdirmove
d883bfbd2e60 convert/mtn: handle directory move into moved directory (issue1619/3)
Patrick Mezard <pmezard@gmail.com>
parents: 8123
diff changeset 
   107
 
2 dirdirmove2
d883bfbd2e60 convert/mtn: handle directory move into moved directory (issue1619/3)
Patrick Mezard <pmezard@gmail.com>
parents: 8123
diff changeset 
   108
 
1 divergentdirmove
d883bfbd2e60 convert/mtn: handle directory move into moved directory (issue1619/3)
Patrick Mezard <pmezard@gmail.com>
parents: 8123
diff changeset 
   109
 
0 divergentdirmove2
d883bfbd2e60 convert/mtn: handle directory move into moved directory (issue1619/3)
Patrick Mezard <pmezard@gmail.com>
parents: 8123
diff changeset 
   110
 
11 files updated, 0 files merged, 0 files removed, 0 files unresolved
d883bfbd2e60 convert/mtn: handle directory move into moved directory (issue1619/3)
Patrick Mezard <pmezard@gmail.com>
parents: 8123
diff changeset 
   111
 
@  13 "divergentdirmove2" files: dir7-2/c dir7/c dir7/dir9/b dir7/dir9/dir8/a dir8-2/a dir9-2/b
d883bfbd2e60 convert/mtn: handle directory move into moved directory (issue1619/3)
Patrick Mezard <pmezard@gmail.com>
parents: 8123
diff changeset 
   112
 
|
d883bfbd2e60 convert/mtn: handle directory move into moved directory (issue1619/3)
Patrick Mezard <pmezard@gmail.com>
parents: 8123
diff changeset 
   113
 
o  12 "divergentdirmove" files: dir7/c dir7/dir9/b dir7/dir9/dir8/a
d883bfbd2e60 convert/mtn: handle directory move into moved directory (issue1619/3)
Patrick Mezard <pmezard@gmail.com>
parents: 8123
diff changeset 
   114
 
|
d883bfbd2e60 convert/mtn: handle directory move into moved directory (issue1619/3)
Patrick Mezard <pmezard@gmail.com>
parents: 8123
diff changeset 
   115
 
o  11 "dirdirmove2" files: dir4/a dir6/dir4/a
d883bfbd2e60 convert/mtn: handle directory move into moved directory (issue1619/3)
Patrick Mezard <pmezard@gmail.com>
parents: 8123
diff changeset 
   116
 
|
d883bfbd2e60 convert/mtn: handle directory move into moved directory (issue1619/3)
Patrick Mezard <pmezard@gmail.com>
parents: 8123
diff changeset 
   117
 
o  10 "dirdirmove" files: dir4/a
d883bfbd2e60 convert/mtn: handle directory move into moved directory (issue1619/3)
Patrick Mezard <pmezard@gmail.com>
parents: 8123
diff changeset 
   118
 
|
d883bfbd2e60 convert/mtn: handle directory move into moved directory (issue1619/3)
Patrick Mezard <pmezard@gmail.com>
parents: 8123
diff changeset 
   119
 
o  9 "dirfilemove2" files: dir3/a dir3/d2/a
8123
933b874e402f convert/mtn: handle files moved in a moved directory (issue1619/2)
Patrick Mezard <pmezard@gmail.com>
parents: 8099
diff changeset 
   120
 
|
933b874e402f convert/mtn: handle files moved in a moved directory (issue1619/2)
Patrick Mezard <pmezard@gmail.com>
parents: 8099
diff changeset 
   121
 
o  8 "dirfilemove" files: dir3/a
933b874e402f convert/mtn: handle files moved in a moved directory (issue1619/2)
Patrick Mezard <pmezard@gmail.com>
parents: 8099
diff changeset 
   122
 
|
933b874e402f convert/mtn: handle files moved in a moved directory (issue1619/2)
Patrick Mezard <pmezard@gmail.com>
parents: 8099
diff changeset 
   123
 
o  7 "dropdirectory" files: dir2/dir/subdir/f
8050
087cc65bebff convert/mtn: record changes from directory renames (issue1587)
Patrick Mezard <pmezard@gmail.com>
parents: 6873
diff changeset 
   124
 
|
087cc65bebff convert/mtn: record changes from directory renames (issue1587)
Patrick Mezard <pmezard@gmail.com>
parents: 6873
diff changeset 
   125
 
o  6 "emptydir" files: dir2/dir/subdir/f
6396
18eeabae6148 test-convert-mtn: test directory deletion
Patrick Mezard <pmezard@gmail.com>
parents: 6377
diff changeset 
   126
 
|
8099
3cdf4872941a convert/mtn: handle new files in moved directories (issue1619)
Patrick Mezard <pmezard@gmail.com>
parents: 8050
diff changeset 
   127
 
o  5 "movedir" files: dir/a dir/d dir2/a dir2/newfile
6396
18eeabae6148 test-convert-mtn: test directory deletion
Patrick Mezard <pmezard@gmail.com>
parents: 6377
diff changeset 
   128
 
|
8050
087cc65bebff convert/mtn: record changes from directory renames (issue1587)
Patrick Mezard <pmezard@gmail.com>
parents: 6873
diff changeset 
   129
 
o  4 "movedir1" files: dir1/subdir1/file1 dir1/subdir2/file1
087cc65bebff convert/mtn: record changes from directory renames (issue1587)
Patrick Mezard <pmezard@gmail.com>
parents: 6873
diff changeset 
   130
 
|
087cc65bebff convert/mtn: record changes from directory renames (issue1587)
Patrick Mezard <pmezard@gmail.com>
parents: 6873
diff changeset 
   131
 
o  3 "createdir1" files: dir1/subdir1/file1 dir1/subdir2_other/file1
6377
2cf67d007f41 test-convert-mtn: test directory move
Patrick Mezard <pmezard@gmail.com>
parents: 6376
diff changeset 
   132
 
|
6633
67a2d2d9bf21 test-convert-mtn: test descriptions with quotes
Patrick Mezard <pmezard@gmail.com>
parents: 6396
diff changeset 
   133
 
o  2 "update2 "with" quotes" files: bin bin2 dir/b e
6372
8f79820443a4 Add a test for monotone conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
   134
 
|
6376
b40e90341ae2 convert: record deleted files in monotone source
Patrick Mezard <pmezard@gmail.com>
parents: 6372
diff changeset 
   135
 
o  1 "update1" files: a bin c dir/a dir/b
6372
8f79820443a4 Add a test for monotone conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
   136
 
|
8099
3cdf4872941a convert/mtn: handle new files in moved directories (issue1619)
Patrick Mezard <pmezard@gmail.com>
parents: 8050
diff changeset 
   137
 
o  0 "initialize" files: a bin c dir/b dir/d
6372
8f79820443a4 Add a test for monotone conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
   138
 












8f79820443a4
Add a test for monotone conversion



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




   139


% manifest













8f79820443a4
Add a test for monotone conversion



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




   140


bin2








8050






087cc65bebff
convert/mtn: record changes from directory renames (issue1587)



Patrick Mezard <pmezard@gmail.com>


parents: 
6873

diff
changeset




   141


dir1/subdir2/file1













087cc65bebff
convert/mtn: record changes from directory renames (issue1587)



Patrick Mezard <pmezard@gmail.com>


parents: 
6873

diff
changeset




   142


dir1/subdir2_other/file1








6377






2cf67d007f41
test-convert-mtn: test directory move



Patrick Mezard <pmezard@gmail.com>


parents: 
6376

diff
changeset




   143


dir2/a








8099






3cdf4872941a
convert/mtn: handle new files in moved directories (issue1619)



Patrick Mezard <pmezard@gmail.com>


parents: 
8050

diff
changeset




   144


dir2/newfile








8123






933b874e402f
convert/mtn: handle files moved in a moved directory (issue1619/2)



Patrick Mezard <pmezard@gmail.com>


parents: 
8099

diff
changeset




   145


dir3/d2/a








8124






d883bfbd2e60
convert/mtn: handle directory move into moved directory (issue1619/3)



Patrick Mezard <pmezard@gmail.com>


parents: 
8123

diff
changeset




   146


dir6/dir4/a













d883bfbd2e60
convert/mtn: handle directory move into moved directory (issue1619/3)



Patrick Mezard <pmezard@gmail.com>


parents: 
8123

diff
changeset




   147


dir7-2/c













d883bfbd2e60
convert/mtn: handle directory move into moved directory (issue1619/3)



Patrick Mezard <pmezard@gmail.com>


parents: 
8123

diff
changeset




   148


dir8-2/a













d883bfbd2e60
convert/mtn: handle directory move into moved directory (issue1619/3)



Patrick Mezard <pmezard@gmail.com>


parents: 
8123

diff
changeset




   149


dir9-2/b








6372






8f79820443a4
Add a test for monotone conversion



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




   150


e













8f79820443a4
Add a test for monotone conversion



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




   151


% contents













8f79820443a4
Add a test for monotone conversion



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




   152


a













8f79820443a4
Add a test for monotone conversion



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




   153


a








8050






087cc65bebff
convert/mtn: record changes from directory renames (issue1587)



Patrick Mezard <pmezard@gmail.com>


parents: 
6873

diff
changeset




   154


% file move













087cc65bebff
convert/mtn: record changes from directory renames (issue1587)



Patrick Mezard <pmezard@gmail.com>


parents: 
6873

diff
changeset




   155


copies:      dir/a (a)













087cc65bebff
convert/mtn: record changes from directory renames (issue1587)



Patrick Mezard <pmezard@gmail.com>


parents: 
6873

diff
changeset




   156


% check directory move













087cc65bebff
convert/mtn: record changes from directory renames (issue1587)



Patrick Mezard <pmezard@gmail.com>


parents: 
6873

diff
changeset




   157


bin2













087cc65bebff
convert/mtn: record changes from directory renames (issue1587)



Patrick Mezard <pmezard@gmail.com>


parents: 
6873

diff
changeset




   158


dir/a








8099






3cdf4872941a
convert/mtn: handle new files in moved directories (issue1619)



Patrick Mezard <pmezard@gmail.com>


parents: 
8050

diff
changeset




   159


dir/d








8050






087cc65bebff
convert/mtn: record changes from directory renames (issue1587)



Patrick Mezard <pmezard@gmail.com>


parents: 
6873

diff
changeset




   160


dir1/subdir2/file1













087cc65bebff
convert/mtn: record changes from directory renames (issue1587)



Patrick Mezard <pmezard@gmail.com>


parents: 
6873

diff
changeset




   161


dir1/subdir2_other/file1













087cc65bebff
convert/mtn: record changes from directory renames (issue1587)



Patrick Mezard <pmezard@gmail.com>


parents: 
6873

diff
changeset




   162


e













087cc65bebff
convert/mtn: record changes from directory renames (issue1587)



Patrick Mezard <pmezard@gmail.com>


parents: 
6873

diff
changeset




   163


copies:      dir1/subdir2/file1 (dir1/subdir1/file1)








8099






3cdf4872941a
convert/mtn: handle new files in moved directories (issue1619)



Patrick Mezard <pmezard@gmail.com>


parents: 
8050

diff
changeset




   164


% check file remove with directory move













3cdf4872941a
convert/mtn: handle new files in moved directories (issue1619)



Patrick Mezard <pmezard@gmail.com>


parents: 
8050

diff
changeset




   165


bin2













3cdf4872941a
convert/mtn: handle new files in moved directories (issue1619)



Patrick Mezard <pmezard@gmail.com>


parents: 
8050

diff
changeset




   166


dir1/subdir2/file1













3cdf4872941a
convert/mtn: handle new files in moved directories (issue1619)



Patrick Mezard <pmezard@gmail.com>


parents: 
8050

diff
changeset




   167


dir1/subdir2_other/file1













3cdf4872941a
convert/mtn: handle new files in moved directories (issue1619)



Patrick Mezard <pmezard@gmail.com>


parents: 
8050

diff
changeset




   168


dir2/a













3cdf4872941a
convert/mtn: handle new files in moved directories (issue1619)



Patrick Mezard <pmezard@gmail.com>


parents: 
8050

diff
changeset




   169


dir2/newfile













3cdf4872941a
convert/mtn: handle new files in moved directories (issue1619)



Patrick Mezard <pmezard@gmail.com>


parents: 
8050

diff
changeset




   170


e








8123






933b874e402f
convert/mtn: handle files moved in a moved directory (issue1619/2)



Patrick Mezard <pmezard@gmail.com>


parents: 
8099

diff
changeset




   171


% check file move with directory move













933b874e402f
convert/mtn: handle files moved in a moved directory (issue1619/2)



Patrick Mezard <pmezard@gmail.com>


parents: 
8099

diff
changeset




   172


bin2













933b874e402f
convert/mtn: handle files moved in a moved directory (issue1619/2)



Patrick Mezard <pmezard@gmail.com>


parents: 
8099

diff
changeset




   173


dir1/subdir2/file1













933b874e402f
convert/mtn: handle files moved in a moved directory (issue1619/2)



Patrick Mezard <pmezard@gmail.com>


parents: 
8099

diff
changeset




   174


dir1/subdir2_other/file1













933b874e402f
convert/mtn: handle files moved in a moved directory (issue1619/2)



Patrick Mezard <pmezard@gmail.com>


parents: 
8099

diff
changeset




   175


dir2/a













933b874e402f
convert/mtn: handle files moved in a moved directory (issue1619/2)



Patrick Mezard <pmezard@gmail.com>


parents: 
8099

diff
changeset




   176


dir2/newfile













933b874e402f
convert/mtn: handle files moved in a moved directory (issue1619/2)



Patrick Mezard <pmezard@gmail.com>


parents: 
8099

diff
changeset




   177


dir3/d2/a













933b874e402f
convert/mtn: handle files moved in a moved directory (issue1619/2)



Patrick Mezard <pmezard@gmail.com>


parents: 
8099

diff
changeset




   178


e








8124






d883bfbd2e60
convert/mtn: handle directory move into moved directory (issue1619/3)



Patrick Mezard <pmezard@gmail.com>


parents: 
8123

diff
changeset




   179


% check file directory directory move













d883bfbd2e60
convert/mtn: handle directory move into moved directory (issue1619/3)



Patrick Mezard <pmezard@gmail.com>


parents: 
8123

diff
changeset




   180


bin2













d883bfbd2e60
convert/mtn: handle directory move into moved directory (issue1619/3)



Patrick Mezard <pmezard@gmail.com>


parents: 
8123

diff
changeset




   181


dir1/subdir2/file1













d883bfbd2e60
convert/mtn: handle directory move into moved directory (issue1619/3)



Patrick Mezard <pmezard@gmail.com>


parents: 
8123

diff
changeset




   182


dir1/subdir2_other/file1













d883bfbd2e60
convert/mtn: handle directory move into moved directory (issue1619/3)



Patrick Mezard <pmezard@gmail.com>


parents: 
8123

diff
changeset




   183


dir2/a













d883bfbd2e60
convert/mtn: handle directory move into moved directory (issue1619/3)



Patrick Mezard <pmezard@gmail.com>


parents: 
8123

diff
changeset




   184


dir2/newfile













d883bfbd2e60
convert/mtn: handle directory move into moved directory (issue1619/3)



Patrick Mezard <pmezard@gmail.com>


parents: 
8123

diff
changeset




   185


dir3/d2/a













d883bfbd2e60
convert/mtn: handle directory move into moved directory (issue1619/3)



Patrick Mezard <pmezard@gmail.com>


parents: 
8123

diff
changeset




   186


dir6/dir4/a













d883bfbd2e60
convert/mtn: handle directory move into moved directory (issue1619/3)



Patrick Mezard <pmezard@gmail.com>


parents: 
8123

diff
changeset




   187


e













d883bfbd2e60
convert/mtn: handle directory move into moved directory (issue1619/3)



Patrick Mezard <pmezard@gmail.com>


parents: 
8123

diff
changeset




   188


% check divergent directory moves













d883bfbd2e60
convert/mtn: handle directory move into moved directory (issue1619/3)



Patrick Mezard <pmezard@gmail.com>


parents: 
8123

diff
changeset




   189


bin2













d883bfbd2e60
convert/mtn: handle directory move into moved directory (issue1619/3)



Patrick Mezard <pmezard@gmail.com>


parents: 
8123

diff
changeset




   190


dir1/subdir2/file1













d883bfbd2e60
convert/mtn: handle directory move into moved directory (issue1619/3)



Patrick Mezard <pmezard@gmail.com>


parents: 
8123

diff
changeset




   191


dir1/subdir2_other/file1













d883bfbd2e60
convert/mtn: handle directory move into moved directory (issue1619/3)



Patrick Mezard <pmezard@gmail.com>


parents: 
8123

diff
changeset




   192


dir2/a













d883bfbd2e60
convert/mtn: handle directory move into moved directory (issue1619/3)



Patrick Mezard <pmezard@gmail.com>


parents: 
8123

diff
changeset




   193


dir2/newfile













d883bfbd2e60
convert/mtn: handle directory move into moved directory (issue1619/3)



Patrick Mezard <pmezard@gmail.com>


parents: 
8123

diff
changeset




   194


dir3/d2/a













d883bfbd2e60
convert/mtn: handle directory move into moved directory (issue1619/3)



Patrick Mezard <pmezard@gmail.com>


parents: 
8123

diff
changeset




   195


dir6/dir4/a













d883bfbd2e60
convert/mtn: handle directory move into moved directory (issue1619/3)



Patrick Mezard <pmezard@gmail.com>


parents: 
8123

diff
changeset




   196


dir7-2/c













d883bfbd2e60
convert/mtn: handle directory move into moved directory (issue1619/3)



Patrick Mezard <pmezard@gmail.com>


parents: 
8123

diff
changeset




   197


dir8-2/a













d883bfbd2e60
convert/mtn: handle directory move into moved directory (issue1619/3)



Patrick Mezard <pmezard@gmail.com>


parents: 
8123

diff
changeset




   198


dir9-2/b













d883bfbd2e60
convert/mtn: handle directory move into moved directory (issue1619/3)



Patrick Mezard <pmezard@gmail.com>


parents: 
8123

diff
changeset




   199


e















Mercurial