This is an automated email from the ASF dual-hosted git repository.
jsedding pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/trunk by this push:
new 8c3116832b Clarified a pitfall with --merge-paths
new e11d20cb3d Merge pull request #161 from sbluhm/patch-1
8c3116832b is described below
commit 8c3116832b205cfba8a9bae5f668e6865f885e44
Author: sbluhm <[email protected]>
AuthorDate: Tue Nov 12 14:35:18 2019 +0100
Clarified a pitfall with --merge-paths
Clarified a pitfall with a merge operation, should a node be renamed.
---
oak-doc/src/site/markdown/migration.md | 2 ++
1 file changed, 2 insertions(+)
diff --git a/oak-doc/src/site/markdown/migration.md
b/oak-doc/src/site/markdown/migration.md
index 1089e58769..13ebdedfe3 100644
--- a/oak-doc/src/site/markdown/migration.md
+++ b/oak-doc/src/site/markdown/migration.md
@@ -152,6 +152,8 @@ By default, the source repository replaces the destination
repository (if there'
Please notice that in the last example it's necessary to narrow the migration
scope using `--include-paths` parameter.
+A merge might fail with an `OakConstraint0030` message if an already existing
node has been renamed at the source or destination repository. This can be
observed for nodes with an UUID property. The merging node would be copied into
the destination repository which already contains the node under a different
name with the same UUID.
+
### Version history copying
