tests/test-convert-bzr-114.t
changeset 12513 d1f88ae495b4
parent 8126 13b36eb14324
child 22046 7a9cbb315d84
equal deleted inserted replaced
12512:8d84166d34d7 12513:d1f88ae495b4
       
     1 
       
     2   $ "$TESTDIR/hghave" bzr114 || exit 80
       
     3   $ . "$TESTDIR/bzr-definitions"
       
     4 
       
     5 The file/directory replacement can only be reproduced on
       
     6 bzr >= 1.4. Merge it back in test-convert-bzr-directories once
       
     7 this version becomes mainstream.
       
     8 replace file with dir
       
     9 
       
    10   $ mkdir test-replace-file-with-dir
       
    11   $ cd test-replace-file-with-dir
       
    12   $ bzr init -q source
       
    13   $ cd source
       
    14   $ echo d > d
       
    15   $ bzr add -q d
       
    16   $ bzr commit -q -m 'add d file'
       
    17   $ rm d
       
    18   $ mkdir d
       
    19   $ bzr add -q d
       
    20   $ bzr commit -q -m 'replace with d dir'
       
    21   $ echo a > d/a
       
    22   $ bzr add -q d/a
       
    23   $ bzr commit -q -m 'add d/a'
       
    24   $ cd ..
       
    25   $ hg convert source source-hg
       
    26   initializing destination source-hg repository
       
    27   scanning source...
       
    28   sorting...
       
    29   converting...
       
    30   2 add d file
       
    31   1 replace with d dir
       
    32   0 add d/a
       
    33   $ manifest source-hg tip
       
    34   % manifest of tip
       
    35   644   d/a
       
    36   $ cd source-hg
       
    37   $ hg update
       
    38   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
       
    39   $ cd ../..