'bzr merge-into' doesn't support merging a project into an existing subdirectory
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Merge-Into Plugin |
Triaged
|
Medium
|
Unassigned |
Bug Description
Currently 'bzr merge-into' doesn't support merging a projet into an existing directory.
Sample session, repo1 and repo2 were created previously.
+ cd repo2
+ bzr merge-into ../repo1 ./from-repo1
All changes applied successfully.
successful+ bzr commit -m 'merged repo1 in directory from-repo1'
Committing to: /tmp/tmp.
added from-repo1
added from-repo1/file1
Committed revision 2.
+ bzr up
Tree is up to date at revision 2.
+ cd ..
+ cd repo1
+ echo NEW > file1
+ bzr commit -m 'Modified file1'
Committing to: /tmp/tmp.
modified file1
Committed revision 2.
+ cd ..
+ cd repo2
+ bzr merge-into ../repo1 ./from-repo1
Conflict adding file from-repo1. Moved existing file to from-repo1.moved.
Path conflict: from-repo1.
Text conflict in from-repo1/file1
3 conflicts encountered.
Changed in bzr-merge-into: | |
importance: | Undecided → Medium |
status: | New → Triaged |
This also prohibits re-merging a foreign branch (e.g. vendor branch) after that one is updated - if I understand it correctly.