##// END OF EJS Templates
add a fix for issue 1175...
add a fix for issue 1175 If we copy a file followed by an update, it's possible for the parent manifest to no longer contain the source file of the copy, which could cause commit to fail. If this happens, we search backwares from the first parent to find the most likely original revision.

File last commit:

r6798:ceb28b67 default
r6875:0d714a48 default
Show More
test-convert.out
159 lines | 5.5 KiB | text/plain | TextLexer
Patrick Mezard
convert: rename MAPFILE into REVMAP to disambiguate with filemap
r6238 hg convert [OPTION]... SOURCE [DEST [REVMAP]]
Bryan O'Sullivan
convert: refactor sink initialisation, to remove hardcoding of hg...
r5441
Convert a foreign SCM repository to a Mercurial one.
Accepted source formats:
Benoit Boissinot
fix typo in convert help text, update test
r5488 - Mercurial
Bryan O'Sullivan
convert: refactor sink initialisation, to remove hardcoding of hg...
r5441 - CVS
- Darcs
- git
- Subversion
Matt Mackall
convert: fix test complaint for mtn bits
r6308 - Monotone
Thomas Arendsen Hein
Update help output of test-convert for GNU arch entry.
r6039 - GNU Arch
Bryan O'Sullivan
convert: refactor sink initialisation, to remove hardcoding of hg...
r5441
Accepted destination formats:
- Mercurial
Bryan O'Sullivan
convert: add support for Subversion as a sink
r5513 - Subversion (history on branches is not preserved)
Bryan O'Sullivan
convert: refactor sink initialisation, to remove hardcoding of hg...
r5441
If no revision is given, all revisions will be converted. Otherwise,
convert will only import up to the named revision (given in a format
understood by the source).
If no destination directory name is specified, it defaults to the
basename of the source with '-hg' appended. If the destination
repository doesn't exist, it will be created.
Patrick Mezard
convert: rename MAPFILE into REVMAP to disambiguate with filemap
r6238 If <REVMAP> isn't given, it will be put in a default location
(<dest>/.hg/shamap by default). The <REVMAP> is a simple text
Bryan O'Sullivan
convert: refactor sink initialisation, to remove hardcoding of hg...
r5441 file that maps each source commit ID to the destination ID for
that revision, like so:
<source ID> <destination ID>
If the file doesn't exist, it's automatically created. It's updated
on each commit copied, so convert-repo can be interrupted and can
be run repeatedly to copy new commits.
The [username mapping] file is a simple text file that maps each source
commit author to a destination commit author. It is handy for source SCMs
that use unix logins to identify authors (eg: CVS). One line per author
mapping and the line format is:
srcauthor=whatever string you want
The filemap is a file that allows filtering and remapping of files
and directories. Comment lines start with '#'. Each line can
contain one of the following directives:
include path/to/file
exclude path/to/file
rename from/file to/file
Thomas Arendsen Hein
Adjust changed test output after 0145f9afb0e7 (trailing whitespace)
r5761
Bryan O'Sullivan
convert: refactor sink initialisation, to remove hardcoding of hg...
r5441 The 'include' directive causes a file, or all files under a
Benoit Boissinot
fix typo in convert help text, update test
r5488 directory, to be included in the destination repository, and the
exclusion of all other files and dirs not explicitely included.
The 'exclude' directive causes files or directories to be omitted.
The 'rename' directive renames a file or directory. To rename from a
subdirectory into the root of the repository, use '.' as the path to
rename to.
Bryan O'Sullivan
convert: refactor sink initialisation, to remove hardcoding of hg...
r5441
Alexis S. L. Carvalho
update output of test-convert
r6148 The splicemap is a file that allows insertion of synthetic
history, letting you specify the parents of a revision. This is
useful if you want to e.g. give a Subversion merge two parents, or
graft two disconnected series of history together. Each entry
contains a key, followed by a space, followed by one or two
values, separated by spaces. The key is the revision ID in the
source revision control system whose parents should be modified
(same format as a key in .hg/shamap). The values are the revision
IDs (in either the source or destination revision control system)
that should be used as the new parents for that node.
Patrick Mezard
Fix test-convert.out after 55455556f921
r6170 Mercurial Source
-----------------
--config convert.hg.saverev=True (boolean)
allow target to preserve source revision ID
Subversion Source
-----------------
Subversion source detects classical trunk/branches/tags layouts.
By default, the supplied "svn://repo/path/" source URL is
converted as a single branch. If "svn://repo/path/trunk" exists
it replaces the default branch. If "svn://repo/path/branches"
exists, its subdirectories are listed as possible branches. If
"svn://repo/path/tags" exists, it is looked for tags referencing
converted branches. Default "trunk", "branches" and "tags" values
can be overriden with following options. Set them to paths
Patrick Mezard
convert: allow svn trunk/branches/tags detection to be skipped...
r6172 relative to the source URL, or leave them blank to disable
autodetection.
Patrick Mezard
Fix test-convert.out after 55455556f921
r6170
--config convert.svn.branches=branches (directory name)
specify the directory containing branches
--config convert.svn.tags=tags (directory name)
specify the directory containing tags
--config convert.svn.trunk=trunk (directory name)
specify the name of the trunk branch
Patrick Mezard
convert: add shallow, single branch svn conversions via svn.startrev
r6173 Source history can be retrieved starting at a specific revision,
instead of being integrally converted. Only single branch
conversions are supported.
--config convert.svn.startrev=0 (svn revision number)
specify start Subversion revision.
Patrick Mezard
Fix test-convert.out after 55455556f921
r6170 Mercurial Destination
---------------------
Bryan O'Sullivan
convert: some tidyups, doc improvements, and test fixes...
r5556
--config convert.hg.clonebranches=False (boolean)
Patrick Mezard
Fix test-convert.out after 55455556f921
r6170 dispatch source branches in separate clones.
Bryan O'Sullivan
convert: some tidyups, doc improvements, and test fixes...
r5556 --config convert.hg.tagsbranch=default (branch name)
Patrick Mezard
Fix test-convert.out after 55455556f921
r6170 tag revisions branch name
Bryan O'Sullivan
convert: some tidyups, doc improvements, and test fixes...
r5556 --config convert.hg.usebranchnames=True (boolean)
Patrick Mezard
Fix test-convert.out after 55455556f921
r6170 preserve branch names
Bryan O'Sullivan
convert: some tidyups, doc improvements, and test fixes...
r5556
Bryan O'Sullivan
convert: refactor sink initialisation, to remove hardcoding of hg...
r5441 options:
-A --authors username mapping filename
-d --dest-type destination repository type
--filemap remap file names using contents of file
-r --rev import up to target revision REV
-s --source-type source repository type
Alexis S. L. Carvalho
update output of test-convert
r6148 --splicemap splice synthesized history into place
Bryan O'Sullivan
convert: refactor sink initialisation, to remove hardcoding of hg...
r5441 --datesort try to sort changesets by date
use "hg -v help convert" to show global options
Bryan O'Sullivan
convert: add test
r5015 adding a
assuming destination a-hg
initializing destination a-hg repository
scanning source...
sorting...
converting...
4 a
3 b
2 c
1 d
0 e
pulling from ../a
searching for changes
no changes found
Bryan O'Sullivan
convert: refactor sink initialisation, to remove hardcoding of hg...
r5441 % should fail
initializing destination bogusfile repository
abort: cannot create new bundle repository
% should fail
abort: Permission denied: bogusdir
% should succeed
initializing destination bogusdir repository
scanning source...
sorting...
converting...
4 a
3 b
2 c
1 d
0 e
Patrick Mezard
test-convert: test before() and after() conversion actions
r5805 % test pre and post conversion actions
run hg source pre-conversion action
run hg sink pre-conversion action
run hg sink post-conversion action
run hg source post-conversion action