Mercurial > hg

annotate tests/test-convert-mtn-rename-directory.out @ 16458:55982f62651f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit: add option to amend the working dir parent The --amend flag can be used to amend the parent of the working directory with a new commit that contains the changes in the parent in addition to those currently reported by "hg status", if there are any. The old commit is stored in a backup bundle in ".hg/strip-backup"(see "hg help bundle" and "hg help unbundle" on how to restore it). Message, user and date are taken from the amended commit unless specified. When a message isn't specified on the command line, the editor will open with the message of the amended commit. It is not possible to amend public changesets (see "hg help phases") or changesets that have children. Behind the scenes, first commit the update (if there is one) as a regular child of the current parent. Then create a new commit on the parent's parent with the updated contents. Then change the working copy parent to this new combined changeset. Finally, strip the amended commit and update commit created in the beginning. An alternative (cleaner?) approach of doing this is suggested here: http://selenic.com/pipermail/mercurial-devel/2012-March/038540.html It is currently not possible to amend merge commits or recursively, this can be added at a later time.
author Idan Kamara <idankk86@gmail.com>
date Wed, 18 Apr 2012 01:20:16 +0300
parents 88a2687fbd38
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
7957
88a2687fbd38 right way to check if file was in renamed directory, fixes import monotone
Pavel Volkovitskiy <int@mtx.ru>
parents:
diff changeset
1 % tedious monotone keys configuration
88a2687fbd38 right way to check if file was in renamed directory, fixes import monotone
Pavel Volkovitskiy <int@mtx.ru>
parents:
diff changeset
2 % create monotone repository
88a2687fbd38 right way to check if file was in renamed directory, fixes import monotone
Pavel Volkovitskiy <int@mtx.ru>
parents:
diff changeset
3 mtn: adding dir1 to workspace manifest
88a2687fbd38 right way to check if file was in renamed directory, fixes import monotone
Pavel Volkovitskiy <int@mtx.ru>
parents:
diff changeset
4 mtn: adding dir1/subdir1 to workspace manifest
88a2687fbd38 right way to check if file was in renamed directory, fixes import monotone
Pavel Volkovitskiy <int@mtx.ru>
parents:
diff changeset
5 mtn: adding dir1/subdir1/file1 to workspace manifest
88a2687fbd38 right way to check if file was in renamed directory, fixes import monotone
Pavel Volkovitskiy <int@mtx.ru>
parents:
diff changeset
6 mtn: beginning commit on branch 'com.selenic.test'
88a2687fbd38 right way to check if file was in renamed directory, fixes import monotone
Pavel Volkovitskiy <int@mtx.ru>
parents:
diff changeset
7 mtn: committed revision 5ed13ff5582d8d1e319f079b694a37d2b45edfc8
88a2687fbd38 right way to check if file was in renamed directory, fixes import monotone
Pavel Volkovitskiy <int@mtx.ru>
parents:
diff changeset
8 % rename directory
88a2687fbd38 right way to check if file was in renamed directory, fixes import monotone
Pavel Volkovitskiy <int@mtx.ru>
parents:
diff changeset
9 mtn: skipping dir1, already accounted for in workspace
88a2687fbd38 right way to check if file was in renamed directory, fixes import monotone
Pavel Volkovitskiy <int@mtx.ru>
parents:
diff changeset
10 mtn: renaming dir1/subdir1 to dir1/subdir2 in workspace manifest
88a2687fbd38 right way to check if file was in renamed directory, fixes import monotone
Pavel Volkovitskiy <int@mtx.ru>
parents:
diff changeset
11 mtn: beginning commit on branch 'com.selenic.test'
88a2687fbd38 right way to check if file was in renamed directory, fixes import monotone
Pavel Volkovitskiy <int@mtx.ru>
parents:
diff changeset
12 mtn: committed revision 985204142a822b22ee86b509d61f3c5ab6857d2b
88a2687fbd38 right way to check if file was in renamed directory, fixes import monotone
Pavel Volkovitskiy <int@mtx.ru>
parents:
diff changeset
13 % convert
88a2687fbd38 right way to check if file was in renamed directory, fixes import monotone
Pavel Volkovitskiy <int@mtx.ru>
parents:
diff changeset
14 assuming destination repo.mtn-hg
88a2687fbd38 right way to check if file was in renamed directory, fixes import monotone
Pavel Volkovitskiy <int@mtx.ru>
parents:
diff changeset
15 initializing destination repo.mtn-hg repository
88a2687fbd38 right way to check if file was in renamed directory, fixes import monotone
Pavel Volkovitskiy <int@mtx.ru>
parents:
diff changeset
16 scanning source...
88a2687fbd38 right way to check if file was in renamed directory, fixes import monotone
Pavel Volkovitskiy <int@mtx.ru>
parents:
diff changeset
17 sorting...
88a2687fbd38 right way to check if file was in renamed directory, fixes import monotone
Pavel Volkovitskiy <int@mtx.ru>
parents:
diff changeset
18 converting...
88a2687fbd38 right way to check if file was in renamed directory, fixes import monotone
Pavel Volkovitskiy <int@mtx.ru>
parents:
diff changeset
19 1 initialize
88a2687fbd38 right way to check if file was in renamed directory, fixes import monotone
Pavel Volkovitskiy <int@mtx.ru>
parents:
diff changeset
20 0 rename
88a2687fbd38 right way to check if file was in renamed directory, fixes import monotone
Pavel Volkovitskiy <int@mtx.ru>
parents:
diff changeset
21 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
88a2687fbd38 right way to check if file was in renamed directory, fixes import monotone
Pavel Volkovitskiy <int@mtx.ru>
parents:
diff changeset
22 % manifest
88a2687fbd38 right way to check if file was in renamed directory, fixes import monotone
Pavel Volkovitskiy <int@mtx.ru>
parents:
diff changeset
23 dir1/subdir2/file1