Add --flatten option to use when merge conflicts cannot be imported #1019
Conversation
|
I think the AppVeyor build is failing for its own reasons. I don't see any relationship of its output to my changes. Can somebody have a look at this change please? It's been 7 days now, I'd appreciate some feedback |
|
Sorry, yeah, the appveyor build is flapping a lot. I've been extremely busy, I'll take a look when I can. |
There was a problem hiding this comment.
Very minor tweaks and we're good to merge. Thanks again for your patience, @dmaksimovic.
src/commands/ImportCommand.js
Outdated
| createPatchForCommit(sha) { | ||
| let patch = null; | ||
| if (this.options.flatten) { | ||
| const diff = this.externalExecSync("git", ["log", "--reverse", "--first-parent", "-p", |
There was a problem hiding this comment.
I'd appreciate if the array of args was spread one-per-line for readability, thanks.
| @@ -105,24 +117,39 @@ export default class ImportCommand extends Command { | |||
| return ChildProcessUtilities.execSync(cmd, args, this.externalExecOpts); | |||
| } | |||
|
|
|||
| createPatchForCommit(sha) { | |||
There was a problem hiding this comment.
Thanks for extracting this method :)
There was a problem hiding this comment.
No worries, it was my pleasure. Changes applied as requested
test/ImportCommand.js
Outdated
| const branchName = "conflict_branch"; | ||
| const conflictedFileName = "conflicted-file.txt"; | ||
| const conflictedFile = path.join(externalDir, conflictedFileName); | ||
| await fs.writeFile(conflictedFile, "initial content"); |
There was a problem hiding this comment.
Please put newlines before the fs.writeFile() bits so the logical steps are a bit easier to follow, thanks.
evocateur
changed the title
|
Thanks! |
|
Cheers! |
|
This thread has been automatically locked because there has not been any recent activity after it was closed. Please open a new issue for related bugs. |
Add option "--flatten" to import each merge as a single change the merge introduced
Description
Instead of doing "git format-patch", patches can be created by "git log" with a certain set of options that mimic format-patch, but with git log some additional options are available, like "--first-parent", which only follows main branch, so that side branch commits are not taken in separately, but instead only the merge commit is imported containing all changes from all branches commits that were merged there.
Motivation and Context
This is required for situations when there were merge commits containing merge conflict resolutions in imported project. In the current implementation, "lerna import" fails because "git format-patch" does not include merge commits and its resolution, so such projects can't be imported. If "--flatten" is provided with the proposed solution, these problematic projects are successfully imported.
The issue was first reported in #730, and I personally had this issue so I had to fix it in order to use Lerna. Now I'm sharing the solution.
How Has This Been Tested?
Tested with all sorts of importable repos, with several branches merged, with binary content, with conflicts and without conflicts, with my option and with the original option. Also all auto tests pass and one automatic test added.
Types of changes
Checklist: