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-bzr.out
author Brodie Rao <brodie@bitheap.org>
Fri, 02 Apr 2010 15:22:19 -0500
changeset 10827 b66388f6adfa
parent 8470 dd24488cba2d
permissions -rw-r--r--
color: don't split colors across lines (which confuses less -R) Currently, less -R doesn't support colors spanning multiple lines; only the first line will be colorized. Instead of allowing colors to span multiple lines, the color extension now applies colors to each line it receives, even when ui.write() is given multiple lines in one call.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
7053
209ef5f3534c convert: add bzr source
Marek Kubica <marek@xivilization.net>
parents:
diff changeset 
     1
 
% create and rename on the same file in the same step
209ef5f3534c convert: add bzr source
Marek Kubica <marek@xivilization.net>
parents:
diff changeset 
     2
 
a => b
8036
dbcf5d52fcf5 test-convert-bzr: check renamed files are removed (issue1505)
Patrick Mezard <pmezard@gmail.com>
parents: 7053
diff changeset 
     3
 
c => d
8045
e09a2f2ef85d convert/bzr: fix file rename replaced by a dir case (issue1583)
Patrick Mezard <pmezard@gmail.com>
parents: 8036
diff changeset 
     4
 
e => f
7053
209ef5f3534c convert: add bzr source
Marek Kubica <marek@xivilization.net>
parents:
diff changeset 
     5
 
initializing destination source-hg repository
209ef5f3534c convert: add bzr source
Marek Kubica <marek@xivilization.net>
parents:
diff changeset 
     6
 
scanning source...
209ef5f3534c convert: add bzr source
Marek Kubica <marek@xivilization.net>
parents:
diff changeset 
     7
 
sorting...
209ef5f3534c convert: add bzr source
Marek Kubica <marek@xivilization.net>
parents:
diff changeset 
     8
 
converting...
8045
e09a2f2ef85d convert/bzr: fix file rename replaced by a dir case (issue1583)
Patrick Mezard <pmezard@gmail.com>
parents: 8036
diff changeset 
     9
 
1 Initial add: a, c, e
8036
dbcf5d52fcf5 test-convert-bzr: check renamed files are removed (issue1505)
Patrick Mezard <pmezard@gmail.com>
parents: 7053
diff changeset 
    10
 
0 rename a into b, create a, rename c into d
8045
e09a2f2ef85d convert/bzr: fix file rename replaced by a dir case (issue1583)
Patrick Mezard <pmezard@gmail.com>
parents: 8036
diff changeset 
    11
 
o  1 "rename a into b, create a, rename c into d" files: a b c d e f
7053
209ef5f3534c convert: add bzr source
Marek Kubica <marek@xivilization.net>
parents:
diff changeset 
    12
 
|
8045
e09a2f2ef85d convert/bzr: fix file rename replaced by a dir case (issue1583)
Patrick Mezard <pmezard@gmail.com>
parents: 8036
diff changeset 
    13
 
o  0 "Initial add: a, c, e" files: a c e
7053
209ef5f3534c convert: add bzr source
Marek Kubica <marek@xivilization.net>
parents:
diff changeset 
    14
 







8036






dbcf5d52fcf5
test-convert-bzr: check renamed files are removed (issue1505)



Patrick Mezard <pmezard@gmail.com>


parents: 
7053

diff
changeset




    15


% manifest













dbcf5d52fcf5
test-convert-bzr: check renamed files are removed (issue1505)



Patrick Mezard <pmezard@gmail.com>


parents: 
7053

diff
changeset




    16


a













dbcf5d52fcf5
test-convert-bzr: check renamed files are removed (issue1505)



Patrick Mezard <pmezard@gmail.com>


parents: 
7053

diff
changeset




    17


b













dbcf5d52fcf5
test-convert-bzr: check renamed files are removed (issue1505)



Patrick Mezard <pmezard@gmail.com>


parents: 
7053

diff
changeset




    18


d








8045






e09a2f2ef85d
convert/bzr: fix file rename replaced by a dir case (issue1583)



Patrick Mezard <pmezard@gmail.com>


parents: 
8036

diff
changeset




    19


f








7053






209ef5f3534c
convert: add bzr source



Marek Kubica <marek@xivilization.net>


parents: 

diff
changeset




    20


% test --rev option













209ef5f3534c
convert: add bzr source



Marek Kubica <marek@xivilization.net>


parents: 

diff
changeset




    21


initializing destination source-1-hg repository













209ef5f3534c
convert: add bzr source



Marek Kubica <marek@xivilization.net>


parents: 

diff
changeset




    22


scanning source...













209ef5f3534c
convert: add bzr source



Marek Kubica <marek@xivilization.net>


parents: 

diff
changeset




    23


sorting...













209ef5f3534c
convert: add bzr source



Marek Kubica <marek@xivilization.net>


parents: 

diff
changeset




    24


converting...








8045






e09a2f2ef85d
convert/bzr: fix file rename replaced by a dir case (issue1583)



Patrick Mezard <pmezard@gmail.com>


parents: 
8036

diff
changeset




    25


0 Initial add: a, c, e













e09a2f2ef85d
convert/bzr: fix file rename replaced by a dir case (issue1583)



Patrick Mezard <pmezard@gmail.com>


parents: 
8036

diff
changeset




    26


o  0 "Initial add: a, c, e" files: a c e








7053






209ef5f3534c
convert: add bzr source



Marek Kubica <marek@xivilization.net>


parents: 

diff
changeset




    27









8165






78658990c725
convert/bzr: make it work with filemaps (issue1631)



Patrick Mezard <pmezard@gmail.com>


parents: 
8148

diff
changeset




    28


% test with filemap













78658990c725
convert/bzr: make it work with filemaps (issue1631)



Patrick Mezard <pmezard@gmail.com>


parents: 
8148

diff
changeset




    29


initializing destination source-filemap-hg repository













78658990c725
convert/bzr: make it work with filemaps (issue1631)



Patrick Mezard <pmezard@gmail.com>


parents: 
8148

diff
changeset




    30


scanning source...













78658990c725
convert/bzr: make it work with filemaps (issue1631)



Patrick Mezard <pmezard@gmail.com>


parents: 
8148

diff
changeset




    31


sorting...













78658990c725
convert/bzr: make it work with filemaps (issue1631)



Patrick Mezard <pmezard@gmail.com>


parents: 
8148

diff
changeset




    32


converting...













78658990c725
convert/bzr: make it work with filemaps (issue1631)



Patrick Mezard <pmezard@gmail.com>


parents: 
8148

diff
changeset




    33


1 Initial add: a, c, e













78658990c725
convert/bzr: make it work with filemaps (issue1631)



Patrick Mezard <pmezard@gmail.com>


parents: 
8148

diff
changeset




    34


0 rename a into b, create a, rename c into d













78658990c725
convert/bzr: make it work with filemaps (issue1631)



Patrick Mezard <pmezard@gmail.com>


parents: 
8148

diff
changeset




    35


b













78658990c725
convert/bzr: make it work with filemaps (issue1631)



Patrick Mezard <pmezard@gmail.com>


parents: 
8148

diff
changeset




    36


d













78658990c725
convert/bzr: make it work with filemaps (issue1631)



Patrick Mezard <pmezard@gmail.com>


parents: 
8148

diff
changeset




    37


f








8470






dd24488cba2d
convert/bzr: warn when source is a lightweight checkout (issue1647)



Patrick Mezard <pmezard@gmail.com>


parents: 
8434

diff
changeset




    38


% convert from lightweight checkout













dd24488cba2d
convert/bzr: warn when source is a lightweight checkout (issue1647)



Patrick Mezard <pmezard@gmail.com>


parents: 
8434

diff
changeset




    39


initializing destination source-light-hg repository













dd24488cba2d
convert/bzr: warn when source is a lightweight checkout (issue1647)



Patrick Mezard <pmezard@gmail.com>


parents: 
8434

diff
changeset




    40


warning: lightweight checkouts may cause conversion failures, try with a regular branch instead.













dd24488cba2d
convert/bzr: warn when source is a lightweight checkout (issue1647)



Patrick Mezard <pmezard@gmail.com>


parents: 
8434

diff
changeset




    41


scanning source...













dd24488cba2d
convert/bzr: warn when source is a lightweight checkout (issue1647)



Patrick Mezard <pmezard@gmail.com>


parents: 
8434

diff
changeset




    42


sorting...













dd24488cba2d
convert/bzr: warn when source is a lightweight checkout (issue1647)



Patrick Mezard <pmezard@gmail.com>


parents: 
8434

diff
changeset




    43


converting...













dd24488cba2d
convert/bzr: warn when source is a lightweight checkout (issue1647)



Patrick Mezard <pmezard@gmail.com>


parents: 
8434

diff
changeset




    44


1 Initial add: a, c, e













dd24488cba2d
convert/bzr: warn when source is a lightweight checkout (issue1647)



Patrick Mezard <pmezard@gmail.com>


parents: 
8434

diff
changeset




    45


0 rename a into b, create a, rename c into d













dd24488cba2d
convert/bzr: warn when source is a lightweight checkout (issue1647)



Patrick Mezard <pmezard@gmail.com>


parents: 
8434

diff
changeset




    46


% lightweight manifest













dd24488cba2d
convert/bzr: warn when source is a lightweight checkout (issue1647)



Patrick Mezard <pmezard@gmail.com>


parents: 
8434

diff
changeset




    47


a













dd24488cba2d
convert/bzr: warn when source is a lightweight checkout (issue1647)



Patrick Mezard <pmezard@gmail.com>


parents: 
8434

diff
changeset




    48


b













dd24488cba2d
convert/bzr: warn when source is a lightweight checkout (issue1647)



Patrick Mezard <pmezard@gmail.com>


parents: 
8434

diff
changeset




    49


d













dd24488cba2d
convert/bzr: warn when source is a lightweight checkout (issue1647)



Patrick Mezard <pmezard@gmail.com>


parents: 
8434

diff
changeset




    50


f








8305






7a0fcdd3828f
convert/bzr: handle Bazaar timestamps correctly (issue1652).



Greg Ward <greg-hg@gerg.ca>


parents: 
8165

diff
changeset




    51


% compare timestamps













7a0fcdd3828f
convert/bzr: handle Bazaar timestamps correctly (issue1652).



Greg Ward <greg-hg@gerg.ca>


parents: 
8165

diff
changeset




    52


good: hg timestamps match bzr timestamps








7053






209ef5f3534c
convert: add bzr source



Marek Kubica <marek@xivilization.net>


parents: 

diff
changeset




    53


% merge













209ef5f3534c
convert: add bzr source



Marek Kubica <marek@xivilization.net>


parents: 

diff
changeset




    54


initializing destination source-hg repository













209ef5f3534c
convert: add bzr source



Marek Kubica <marek@xivilization.net>


parents: 

diff
changeset




    55


scanning source...













209ef5f3534c
convert: add bzr source



Marek Kubica <marek@xivilization.net>


parents: 

diff
changeset




    56


sorting...













209ef5f3534c
convert: add bzr source



Marek Kubica <marek@xivilization.net>


parents: 

diff
changeset




    57


converting...













209ef5f3534c
convert: add bzr source



Marek Kubica <marek@xivilization.net>


parents: 

diff
changeset




    58


3 Initial add













209ef5f3534c
convert: add bzr source



Marek Kubica <marek@xivilization.net>


parents: 

diff
changeset




    59


2 Editing a













209ef5f3534c
convert: add bzr source



Marek Kubica <marek@xivilization.net>


parents: 

diff
changeset




    60


1 Editing b













209ef5f3534c
convert: add bzr source



Marek Kubica <marek@xivilization.net>


parents: 

diff
changeset




    61


0 Merged improve branch













209ef5f3534c
convert: add bzr source



Marek Kubica <marek@xivilization.net>


parents: 

diff
changeset




    62


o    3 "Merged improve branch" files:













209ef5f3534c
convert: add bzr source



Marek Kubica <marek@xivilization.net>


parents: 

diff
changeset




    63


|\













209ef5f3534c
convert: add bzr source



Marek Kubica <marek@xivilization.net>


parents: 

diff
changeset




    64


| o  2 "Editing b" files: b













209ef5f3534c
convert: add bzr source



Marek Kubica <marek@xivilization.net>


parents: 

diff
changeset




    65


| |













209ef5f3534c
convert: add bzr source



Marek Kubica <marek@xivilization.net>


parents: 

diff
changeset




    66


o |  1 "Editing a" files: a













209ef5f3534c
convert: add bzr source



Marek Kubica <marek@xivilization.net>


parents: 

diff
changeset




    67


|/













209ef5f3534c
convert: add bzr source



Marek Kubica <marek@xivilization.net>


parents: 

diff
changeset




    68


o  0 "Initial add" files: a b













209ef5f3534c
convert: add bzr source



Marek Kubica <marek@xivilization.net>


parents: 

diff
changeset




    69














209ef5f3534c
convert: add bzr source



Marek Kubica <marek@xivilization.net>


parents: 

diff
changeset




    70


% symlinks and executable files













209ef5f3534c
convert: add bzr source



Marek Kubica <marek@xivilization.net>


parents: 

diff
changeset




    71


initializing destination source-hg repository













209ef5f3534c
convert: add bzr source



Marek Kubica <marek@xivilization.net>


parents: 

diff
changeset




    72


scanning source...













209ef5f3534c
convert: add bzr source



Marek Kubica <marek@xivilization.net>


parents: 

diff
changeset




    73


sorting...













209ef5f3534c
convert: add bzr source



Marek Kubica <marek@xivilization.net>


parents: 

diff
changeset




    74


converting...













209ef5f3534c
convert: add bzr source



Marek Kubica <marek@xivilization.net>


parents: 

diff
changeset




    75


1 Initial setup













209ef5f3534c
convert: add bzr source



Marek Kubica <marek@xivilization.net>


parents: 

diff
changeset




    76


0 Symlink changed, x bits changed













209ef5f3534c
convert: add bzr source



Marek Kubica <marek@xivilization.net>


parents: 

diff
changeset




    77


% manifest of 0








8148






adce97d28389
convert/bzr: fix symlink handling (issue1626)



Patrick Mezard <pmezard@gmail.com>


parents: 
8045

diff
changeset




    78


644 @ altname













adce97d28389
convert/bzr: fix symlink handling (issue1626)



Patrick Mezard <pmezard@gmail.com>


parents: 
8045

diff
changeset




    79


644   d/a








7053






209ef5f3534c
convert: add bzr source



Marek Kubica <marek@xivilization.net>


parents: 

diff
changeset




    80


755 * program








8148






adce97d28389
convert/bzr: fix symlink handling (issue1626)



Patrick Mezard <pmezard@gmail.com>


parents: 
8045

diff
changeset




    81


644 @ syma








7053






209ef5f3534c
convert: add bzr source



Marek Kubica <marek@xivilization.net>


parents: 

diff
changeset




    82


% manifest of tip








8148






adce97d28389
convert/bzr: fix symlink handling (issue1626)



Patrick Mezard <pmezard@gmail.com>


parents: 
8045

diff
changeset




    83


644 @ altname













adce97d28389
convert/bzr: fix symlink handling (issue1626)



Patrick Mezard <pmezard@gmail.com>


parents: 
8045

diff
changeset




    84


644   d/a








7053






209ef5f3534c
convert: add bzr source



Marek Kubica <marek@xivilization.net>


parents: 

diff
changeset




    85


755 * newprog













209ef5f3534c
convert: add bzr source



Marek Kubica <marek@xivilization.net>


parents: 

diff
changeset




    86


644   program








8148






adce97d28389
convert/bzr: fix symlink handling (issue1626)



Patrick Mezard <pmezard@gmail.com>


parents: 
8045

diff
changeset




    87


644 @ syma








8423






eb7be0e752d9
convert/bzr: fix symlinks target (issue1626/2)



Patrick Mezard <pmezard@gmail.com>


parents: 
8165

diff
changeset




    88


% test the symlinks can be recreated













eb7be0e752d9
convert/bzr: fix symlinks target (issue1626/2)



Patrick Mezard <pmezard@gmail.com>


parents: 
8165

diff
changeset




    89


5 files updated, 0 files merged, 0 files removed, 0 files unresolved













eb7be0e752d9
convert/bzr: fix symlinks target (issue1626/2)



Patrick Mezard <pmezard@gmail.com>


parents: 
8165

diff
changeset




    90


a














Mercurial