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.out
author Fabian Kreutz <fabian.kreutz@starnet.fi>
Fri, 17 Apr 2009 14:10:05 +0300
changeset 8114 ad3ba2de2cba
parent 8099 3cdf4872941a
child 8123 933b874e402f
permissions -rw-r--r--
i18n-de: More translations of commands.py (revert, status, unbundle, ...)
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
6372
8f79820443a4 Add a test for monotone conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    56
 
% convert incrementally
8f79820443a4 Add a test for monotone conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    57
 
assuming destination repo.mtn-hg
8f79820443a4 Add a test for monotone conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    58
 
scanning source...
8f79820443a4 Add a test for monotone conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    59
 
sorting...
8f79820443a4 Add a test for monotone conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    60
 
converting...
8050
087cc65bebff convert/mtn: record changes from directory renames (issue1587)
Patrick Mezard <pmezard@gmail.com>
parents: 6873
diff changeset 
    61
 
5 update2 "with" quotes
087cc65bebff convert/mtn: record changes from directory renames (issue1587)
Patrick Mezard <pmezard@gmail.com>
parents: 6873
diff changeset 
    62
 
4 createdir1
087cc65bebff convert/mtn: record changes from directory renames (issue1587)
Patrick Mezard <pmezard@gmail.com>
parents: 6873
diff changeset 
    63
 
3 movedir1
6396
18eeabae6148 test-convert-mtn: test directory deletion
Patrick Mezard <pmezard@gmail.com>
parents: 6377
diff changeset 
    64
 
2 movedir
18eeabae6148 test-convert-mtn: test directory deletion
Patrick Mezard <pmezard@gmail.com>
parents: 6377
diff changeset 
    65
 
1 emptydir
18eeabae6148 test-convert-mtn: test directory deletion
Patrick Mezard <pmezard@gmail.com>
parents: 6377
diff changeset 
    66
 
0 dropdirectory
8099
3cdf4872941a convert/mtn: handle new files in moved directories (issue1619)
Patrick Mezard <pmezard@gmail.com>
parents: 8050
diff changeset 
    67
 
6 files updated, 0 files merged, 0 files removed, 0 files unresolved
8050
087cc65bebff convert/mtn: record changes from directory renames (issue1587)
Patrick Mezard <pmezard@gmail.com>
parents: 6873
diff changeset 
    68
 
@  7 "dropdirectory" files: dir2/dir/subdir/f
087cc65bebff convert/mtn: record changes from directory renames (issue1587)
Patrick Mezard <pmezard@gmail.com>
parents: 6873
diff changeset 
    69
 
|
087cc65bebff convert/mtn: record changes from directory renames (issue1587)
Patrick Mezard <pmezard@gmail.com>
parents: 6873
diff changeset 
    70
 
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 
    71
 
|
8099
3cdf4872941a convert/mtn: handle new files in moved directories (issue1619)
Patrick Mezard <pmezard@gmail.com>
parents: 8050
diff changeset 
    72
 
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 
    73
 
|
8050
087cc65bebff convert/mtn: record changes from directory renames (issue1587)
Patrick Mezard <pmezard@gmail.com>
parents: 6873
diff changeset 
    74
 
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 
    75
 
|
087cc65bebff convert/mtn: record changes from directory renames (issue1587)
Patrick Mezard <pmezard@gmail.com>
parents: 6873
diff changeset 
    76
 
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 
    77
 
|
6633
67a2d2d9bf21 test-convert-mtn: test descriptions with quotes
Patrick Mezard <pmezard@gmail.com>
parents: 6396
diff changeset 
    78
 
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 
    79
 
|
6376
b40e90341ae2 convert: record deleted files in monotone source
Patrick Mezard <pmezard@gmail.com>
parents: 6372
diff changeset 
    80
 
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 
    81
 
|
8099
3cdf4872941a convert/mtn: handle new files in moved directories (issue1619)
Patrick Mezard <pmezard@gmail.com>
parents: 8050
diff changeset 
    82
 
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 
    83
 












8f79820443a4
Add a test for monotone conversion



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




    84


% manifest













8f79820443a4
Add a test for monotone conversion



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




    85


bin2








8050






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



Patrick Mezard <pmezard@gmail.com>


parents: 
6873

diff
changeset




    86


dir1/subdir2/file1













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



Patrick Mezard <pmezard@gmail.com>


parents: 
6873

diff
changeset




    87


dir1/subdir2_other/file1








6377






2cf67d007f41
test-convert-mtn: test directory move



Patrick Mezard <pmezard@gmail.com>


parents: 
6376

diff
changeset




    88


dir2/a








8099






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



Patrick Mezard <pmezard@gmail.com>


parents: 
8050

diff
changeset




    89


dir2/newfile








6372






8f79820443a4
Add a test for monotone conversion



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




    90


e













8f79820443a4
Add a test for monotone conversion



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




    91


% contents













8f79820443a4
Add a test for monotone conversion



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




    92


a













8f79820443a4
Add a test for monotone conversion



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




    93


a








8050






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



Patrick Mezard <pmezard@gmail.com>


parents: 
6873

diff
changeset




    94


% file move













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



Patrick Mezard <pmezard@gmail.com>


parents: 
6873

diff
changeset




    95


copies:      dir/a (a)













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



Patrick Mezard <pmezard@gmail.com>


parents: 
6873

diff
changeset




    96


% check directory move













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



Patrick Mezard <pmezard@gmail.com>


parents: 
6873

diff
changeset




    97


bin2













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



Patrick Mezard <pmezard@gmail.com>


parents: 
6873

diff
changeset




    98


dir/a








8099






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



Patrick Mezard <pmezard@gmail.com>


parents: 
8050

diff
changeset




    99


dir/d








8050






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



Patrick Mezard <pmezard@gmail.com>


parents: 
6873

diff
changeset




   100


dir1/subdir2/file1













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



Patrick Mezard <pmezard@gmail.com>


parents: 
6873

diff
changeset




   101


dir1/subdir2_other/file1













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



Patrick Mezard <pmezard@gmail.com>


parents: 
6873

diff
changeset




   102


e













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



Patrick Mezard <pmezard@gmail.com>


parents: 
6873

diff
changeset




   103


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




   104


% 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




   105


bin2













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



Patrick Mezard <pmezard@gmail.com>


parents: 
8050

diff
changeset




   106


dir1/subdir2/file1













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



Patrick Mezard <pmezard@gmail.com>


parents: 
8050

diff
changeset




   107


dir1/subdir2_other/file1













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



Patrick Mezard <pmezard@gmail.com>


parents: 
8050

diff
changeset




   108


dir2/a













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



Patrick Mezard <pmezard@gmail.com>


parents: 
8050

diff
changeset




   109


dir2/newfile













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



Patrick Mezard <pmezard@gmail.com>


parents: 
8050

diff
changeset




   110


e















hg-stable