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-darcs.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Wed, 31 Mar 2010 12:09:21 +0200
changeset 10792 3152f2732ef5
parent 10490 f2618cacb485
child 12252 4481f8a93c7a
permissions -rw-r--r--
merge with stable
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5413
719fd175181f Test darcs converter
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
     1
 
% initialize darcs repo
719fd175181f Test darcs converter
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
     2
 
Finished recording patch 'p0'
719fd175181f Test darcs converter
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
     3
 
% branch and update
719fd175181f Test darcs converter
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
     4
 
Finished recording patch 'p1.1'
719fd175181f Test darcs converter
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
     5
 
% update source
719fd175181f Test darcs converter
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
     6
 
Finished recording patch 'p1.2'
719fd175181f Test darcs converter
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
     7
 
% merge branch
9326
b236f34ec1e9 Fix failing darcs test
Bryan O'Sullivan <bos@serpentine.com>
parents: 5667
diff changeset 
     8
 
Backing up ./a(-darcs-backup0)
5413
719fd175181f Test darcs converter
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
     9
 
We have conflicts in the following files:
719fd175181f Test darcs converter
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    10
 
./a
719fd175181f Test darcs converter
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    11
 
Finished pulling and applying.
719fd175181f Test darcs converter
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    12
 
Finished recording patch 'p2'
9526
457a30ed8ffb convert/darcs: fix file renaming (issue1853)
Patrick Mezard <pmezard@gmail.com>
parents: 9326
diff changeset 
    13
 
% test file and directory move
457a30ed8ffb convert/darcs: fix file renaming (issue1853)
Patrick Mezard <pmezard@gmail.com>
parents: 9326
diff changeset 
    14
 
Finished recording patch 'p3'
5413
719fd175181f Test darcs converter
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    15
 
initializing destination darcs-repo-hg repository
719fd175181f Test darcs converter
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    16
 
scanning source...
719fd175181f Test darcs converter
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    17
 
sorting...
719fd175181f Test darcs converter
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    18
 
converting...
9526
457a30ed8ffb convert/darcs: fix file renaming (issue1853)
Patrick Mezard <pmezard@gmail.com>
parents: 9326
diff changeset 
    19
 
4 p0
457a30ed8ffb convert/darcs: fix file renaming (issue1853)
Patrick Mezard <pmezard@gmail.com>
parents: 9326
diff changeset 
    20
 
3 p1.2
457a30ed8ffb convert/darcs: fix file renaming (issue1853)
Patrick Mezard <pmezard@gmail.com>
parents: 9326
diff changeset 
    21
 
2 p1.1
457a30ed8ffb convert/darcs: fix file renaming (issue1853)
Patrick Mezard <pmezard@gmail.com>
parents: 9326
diff changeset 
    22
 
1 p2
457a30ed8ffb convert/darcs: fix file renaming (issue1853)
Patrick Mezard <pmezard@gmail.com>
parents: 9326
diff changeset 
    23
 
0 p3
9527
b3c13e721593 convert/darcs: handle directory renaming
Patrick Mezard <pmezard@gmail.com>
parents: 9526
diff changeset 
    24
 
o  4 "p3" files: dir/d dir/d2 dir2/d f ff
9526
457a30ed8ffb convert/darcs: fix file renaming (issue1853)
Patrick Mezard <pmezard@gmail.com>
parents: 9326
diff changeset 
    25
 
|
9527
b3c13e721593 convert/darcs: handle directory renaming
Patrick Mezard <pmezard@gmail.com>
parents: 9526
diff changeset 
    26
 
o  3 "p2" files: a dir/d dir/d2 f
5413
719fd175181f Test darcs converter
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    27
 
|
719fd175181f Test darcs converter
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    28
 
o  2 "p1.1" files:
719fd175181f Test darcs converter
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    29
 
|
719fd175181f Test darcs converter
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    30
 
o  1 "p1.2" files: a b
719fd175181f Test darcs converter
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    31
 
|
719fd175181f Test darcs converter
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    32
 
o  0 "p0" files: a
719fd175181f Test darcs converter
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    33
 












719fd175181f
Test darcs converter



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




    34


7225b30cdf38257d5cc7780772c051b6f33e6d6b 644   a













719fd175181f
Test darcs converter



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




    35


1e88685f5ddec574a34c70af492f95b6debc8741 644   b








10490






f2618cacb485
filelog: sort meta entries, ensure deterministic order



Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>


parents: 
9527

diff
changeset




    36


37406831adc447ec2385014019599dfec953c806 644   dir2/d













f2618cacb485
filelog: sort meta entries, ensure deterministic order



Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>


parents: 
9527

diff
changeset




    37


b783a337463792a5c7d548ad85a7d3253c16ba8c 644   ff















Mercurial