@@ -73,20 +73,23 @@ func (opts *Update) Update() error {
73
73
// 3. Installs old release
74
74
// 4. Runs alpha generate with old release binary
75
75
// 5. Commits the result
76
+ log .Info ("Preparing Ancestor branch with name %s" , opts .AncestorBranch )
76
77
if err := opts .prepareAncestorBranch (); err != nil {
77
78
return fmt .Errorf ("failed to prepare ancestor branch: %w" , err )
78
79
}
79
80
// 1. Creates original branch
80
81
// 2. Ensure that original branch is == Based on user’s current base branch content with
81
82
// git checkout "main" -- .
82
83
// 3. Commits this state
84
+ log .Info ("Preparing Original branch with name %s" , opts .OriginalBranch )
83
85
if err := opts .prepareOriginalBranch (); err != nil {
84
86
return fmt .Errorf ("failed to checkout current off ancestor: %w" , err )
85
87
}
86
88
// 1. Creates upgrade branch from ancestor
87
89
// 2. Cleans up the branch by removing all files except .git and PROJECT
88
90
// 2. Regenerates scaffold using alpha generate with new version
89
91
// 3. Commits the result
92
+ log .Info ("Preparing Upgrade branch with name %s" , opts .UpgradeBranch )
90
93
if err := opts .prepareUpgradeBranch (); err != nil {
91
94
return fmt .Errorf ("failed to checkout upgrade off ancestor: %w" , err )
92
95
}
@@ -95,6 +98,7 @@ func (opts *Update) Update() error {
95
98
// 2. Merges in original (user code)
96
99
// 3. If conflicts occur, it will warn the user and leave the merge branch for manual resolution
97
100
// 4. If merge is clean, it stages the changes and commits the result
101
+ log .Info ("Preparing Merge branch with name %s and performing merge" , opts .MergeBranch )
98
102
if err := opts .mergeOriginalToUpgrade (); err != nil {
99
103
return fmt .Errorf ("failed to merge upgrade into merge branch: %w" , err )
100
104
}
0 commit comments