Mercurial Mercurial > hg > mercurial-crew-with-dirclash / 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-git.out
author Patrick Mezard <pmezard@gmail.com>
Sun, 30 Sep 2007 12:36:11 +0200
changeset 5347 9c0f864fddca
parent 5336 24de027551c1
parent 5346 9f35d0bcf00e
child 5380 a5a7f7fd5554
permissions -rw-r--r--
Merge with crew-stable
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5346
9f35d0bcf00e Test mercurial convert sink removes empty directories.
Patrick Mezard <pmezard@gmail.com>
parents: 5335
diff changeset 
     1
 
rm 'd/b'
5231
ceb6f242fb81 Test git repository conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
     2
 
assuming destination git-repo-hg
ceb6f242fb81 Test git repository conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
     3
 
initializing destination git-repo-hg repository
ceb6f242fb81 Test git repository conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
     4
 
scanning source...
ceb6f242fb81 Test git repository conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
     5
 
sorting...
ceb6f242fb81 Test git repository conversion
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
     6
 
converting...
5346
9f35d0bcf00e Test mercurial convert sink removes empty directories.
Patrick Mezard <pmezard@gmail.com>
parents: 5335
diff changeset 
     7
 
5 t1
9f35d0bcf00e Test mercurial convert sink removes empty directories.
Patrick Mezard <pmezard@gmail.com>
parents: 5335
diff changeset 
     8
 
4 t2
9f35d0bcf00e Test mercurial convert sink removes empty directories.
Patrick Mezard <pmezard@gmail.com>
parents: 5335
diff changeset 
     9
 
3 t3
9f35d0bcf00e Test mercurial convert sink removes empty directories.
Patrick Mezard <pmezard@gmail.com>
parents: 5335
diff changeset 
    10
 
2 t4.1
9f35d0bcf00e Test mercurial convert sink removes empty directories.
Patrick Mezard <pmezard@gmail.com>
parents: 5335
diff changeset 
    11
 
1 t4.2
5335
88e931f74e8b convert_git: avoid returning two entries for the same file in getchanges
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 5271
diff changeset 
    12
 
0 Merge branch other
5347
9c0f864fddca Merge with crew-stable
Patrick Mezard <pmezard@gmail.com>
parents: 5336 5346
diff changeset 
    13
 
changeset:   5:c6d72c98aa00
5335
88e931f74e8b convert_git: avoid returning two entries for the same file in getchanges
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 5271
diff changeset 
    14
 
tag:         tip
5347
9c0f864fddca Merge with crew-stable
Patrick Mezard <pmezard@gmail.com>
parents: 5336 5346
diff changeset 
    15
 
parent:      3:a18bdfccf429
9c0f864fddca Merge with crew-stable
Patrick Mezard <pmezard@gmail.com>
parents: 5336 5346
diff changeset 
    16
 
parent:      4:48cb5b72ce56
5335
88e931f74e8b convert_git: avoid returning two entries for the same file in getchanges
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 5271
diff changeset 
    17
 
user:        test <test@example.org>
5346
9f35d0bcf00e Test mercurial convert sink removes empty directories.
Patrick Mezard <pmezard@gmail.com>
parents: 5335
diff changeset 
    18
 
date:        Mon Jan 01 00:00:15 2007 +0000
5335
88e931f74e8b convert_git: avoid returning two entries for the same file in getchanges
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 5271
diff changeset 
    19
 
files:       a
88e931f74e8b convert_git: avoid returning two entries for the same file in getchanges
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 5271
diff changeset 
    20
 
description:
88e931f74e8b convert_git: avoid returning two entries for the same file in getchanges
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 5271
diff changeset 
    21
 
Merge branch other
88e931f74e8b convert_git: avoid returning two entries for the same file in getchanges
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 5271
diff changeset 
    22
 












88e931f74e8b
convert_git: avoid returning two entries for the same file in getchanges



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 
5271

diff
changeset




    23


committer: test <test@example.org>













88e931f74e8b
convert_git: avoid returning two entries for the same file in getchanges



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 
5271

diff
changeset




    24














88e931f74e8b
convert_git: avoid returning two entries for the same file in getchanges



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 
5271

diff
changeset




    25
















mercurial-crew-with-dirclash