[JBoss JIRA] (JBTM-1691) Auto-merge in narayana.sh is not robust enough
- First Post
- Replies
- Stats
-
Go to
- ----- 2025 -----
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
[
https://issues.jboss.org/browse/JBTM-1691?page=com.atlassian.jira.plugin....
]
Tom Jenkinson updated JBTM-1691:
--------------------------------
Status: Pull Request Sent (was: Open)
Git Pull Request: https://github.com/jbosstm/narayana/pull/315
OK, so I have disabled the ability to auto merge conflicts, this will mean that after the
AS pull is merged we will have to rebase 5_BRANCH with the commit in to rev to the
CURRENT_RELEASED_VERSION
Auto-merge in narayana.sh is not robust enough
----------------------------------------------
Key: JBTM-1691
URL: https://issues.jboss.org/browse/JBTM-1691
Project: JBoss Transaction Manager
Issue Type: Bug
Security Level: Public(Everyone can see)
Components: Build System
Reporter: Paul Robinson
Assignee: Tom Jenkinson
Fix For: 4.17.5, 5.0.0.M4
This can't be auto=merged:
{code}
<<<<<<< HEAD
<version.org.jboss.jbossts.jbossjts>5.0.0.M2</version.org.jboss.jbossts.jbossjts>
<version.org.jboss.jbossts.jbossjts-integration>5.0.0.M2</version.org.jboss.jbossts.jbossjts-integration>
<version.org.jboss.jbossts.jbossxts>5.0.0.M2</version.org.jboss.jbossts.jbossxts>
<version.org.jboss.jboss-vfs>3.2.0.Beta1</version.org.jboss.jboss-vfs>
<version.org.jboss.jbossts.narayana>5.0.0.M2</version.org.jboss.jbossts.narayana>
=======
<version.org.jboss.jbossts.jbossjts>5.0.0.M3-SNAPSHOT</version.org.jboss.jbossts.jbossjts>
<version.org.jboss.jbossts.jbossjts-integration>5.0.0.M3-SNAPSHOT</version.org.jboss.jbossts.jbossjts-integration>
<version.org.jboss.jbossts.jbossxts>5.0.0.M3-SNAPSHOT</version.org.jboss.jbossts.jbossxts>
<version.org.jboss.jboss-vfs>3.1.0.Final</version.org.jboss.jboss-vfs>
<version.org.jboss.jbossts.narayana>5.0.0.M3-SNAPSHOT</version.org.jboss.jbossts.narayana>
>>>>>>> Upgrade Narayana to 5.0.0.M3-SNAPSHOT
{code}
Our current strategy will take our version which results in the old version of jboss-vfs
being used, which in turn causes a build failure in WildFly.
Maybe we should remove the auto-merge and replace with a manual intervention when a
conflict occurs?
--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira
4254
days inactive
4254
days old
jbossts-issues@lists.jboss.org
0 comments
1 participants
tags (0)
participants (1)
-
Tom Jenkinson (JIRA)