Mercurial Mercurial > mercurial / 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 Alexis S. L. Carvalho <alexis@cecm.usp.br>
Wed, 12 Mar 2008 15:44:08 -0700
changeset 6242 a375ffc2aa1b
parent 5667 f29b7c8419cb
child 9326 b236f34ec1e9
permissions -rw-r--r--
merge: fix handling of deleted files
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
719fd175181f Test darcs converter
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
     8
 
We have conflicts in the following files:
719fd175181f Test darcs converter
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
     9
 
./a
719fd175181f Test darcs converter
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    10
 
Finished pulling and applying.
719fd175181f Test darcs converter
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    11
 
Finished recording patch 'p2'
719fd175181f Test darcs converter
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    12
 
initializing destination darcs-repo-hg repository
719fd175181f Test darcs converter
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    13
 
scanning source...
719fd175181f Test darcs converter
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    14
 
sorting...
719fd175181f Test darcs converter
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    15
 
converting...
719fd175181f Test darcs converter
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    16
 
3 p0
719fd175181f Test darcs converter
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    17
 
2 p1.2
719fd175181f Test darcs converter
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    18
 
1 p1.1
719fd175181f Test darcs converter
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    19
 
0 p2
719fd175181f Test darcs converter
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    20
 
o  3 "p2" files: a
719fd175181f Test darcs converter
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    21
 
|
719fd175181f Test darcs converter
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    22
 
o  2 "p1.1" files:
719fd175181f Test darcs converter
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    23
 
|
719fd175181f Test darcs converter
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    24
 
o  1 "p1.2" files: a b
719fd175181f Test darcs converter
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    25
 
|
719fd175181f Test darcs converter
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    26
 
o  0 "p0" files: a
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


7225b30cdf38257d5cc7780772c051b6f33e6d6b 644   a












719fd175181f
Test darcs converter



Patrick Mezard <pmezard@gmail.com>


parents: 

diff
changeset




    29


1e88685f5ddec574a34c70af492f95b6debc8741 644   b














mercurial