Mercurial Mercurial > hg-stable / 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-114.out
author Stefano Tortarolo <stefano.tortarolo@gmail.com>
Tue, 08 Jun 2010 18:01:07 +0200
changeset 11316 7fa3968004c1
parent 8126 13b36eb14324
permissions -rw-r--r--
rebase: --abort doesn't strip away the target changeset (issue2220) When a changeset is skipped, rebase keeps the previous target as next target and if the skipped cset is the first one, the recorded target is actually the original target. --abort did not detect this situation but simply stripped away the cset.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
8126
13b36eb14324 convert/bzr: handle files replaced by directories (issue1623)
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
     1
 
% replace file with dir
13b36eb14324 convert/bzr: handle files replaced by directories (issue1623)
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
     2
 
initializing destination source-hg repository
13b36eb14324 convert/bzr: handle files replaced by directories (issue1623)
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
     3
 
scanning source...
13b36eb14324 convert/bzr: handle files replaced by directories (issue1623)
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
     4
 
sorting...
13b36eb14324 convert/bzr: handle files replaced by directories (issue1623)
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
     5
 
converting...
13b36eb14324 convert/bzr: handle files replaced by directories (issue1623)
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
     6
 
2 add d file
13b36eb14324 convert/bzr: handle files replaced by directories (issue1623)
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
     7
 
1 replace with d dir
13b36eb14324 convert/bzr: handle files replaced by directories (issue1623)
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
     8
 
0 add d/a
13b36eb14324 convert/bzr: handle files replaced by directories (issue1623)
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
     9
 
% manifest of tip
13b36eb14324 convert/bzr: handle files replaced by directories (issue1623)
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    10
 
644   d/a
13b36eb14324 convert/bzr: handle files replaced by directories (issue1623)
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset 
    11
 
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
hg-stable