You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gn...@apache.org on 2023/01/03 11:58:11 UTC
[camel] 02/10: Reenable git commands
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch jakarta/rewritten
in repository https://gitbox.apache.org/repos/asf/camel.git
commit e48aabc70860757a18b47204aef21ee7f6ade5a8
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Thu Dec 8 14:01:19 2022 +0100
Reenable git commands
---
jakarta/rewrite.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/jakarta/rewrite.java b/jakarta/rewrite.java
index bc55ad48238..a8232d0f842 100755
--- a/jakarta/rewrite.java
+++ b/jakarta/rewrite.java
@@ -33,9 +33,10 @@ class rewrite implements Callable<Integer> {
@Override
public Integer call() throws Exception {
// Rebase on top of main
- // exec("git", "checkout", "jakarta-rewrite");
+ exec("git", "checkout", "jakarta/rewrite");
+ exec("git", "rebase", "origin/main");
// Create/reset branch 'rewritten'
- // exec("git", "checkout", "-B", "jakarta-rewritten", "jakarta-rewrite");
+ exec("git", "checkout", "-B", "jakarta/rewritten", "jakarta/rewrite");
// Switch version to 4.0.0-SNAPSHOT
System.out.println("Switch version to 4.0.0-SNAPSHOT");