maven-issues mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Mark Struberg (JIRA)" <j...@codehaus.org>
Subject [jira] Closed: (SCM-488) Git provider fails to support 'release:perform' if not releasing from remote HEAD
Date Thu, 08 Oct 2009 12:43:32 GMT

     [ http://jira.codehaus.org/browse/SCM-488?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]

Mark Struberg closed SCM-488.
-----------------------------

       Resolution: Fixed
    Fix Version/s: 1.3

fixed in Revision 823147

> Git provider fails to support 'release:perform' if not releasing from remote HEAD
> ---------------------------------------------------------------------------------
>
>                 Key: SCM-488
>                 URL: http://jira.codehaus.org/browse/SCM-488
>             Project: Maven SCM
>          Issue Type: Bug
>          Components: maven-scm-provider-git
>            Reporter: Petter Måhlén
>            Assignee: Mark Struberg
>             Fix For: 1.3
>
>
> During the 'release:perform' phase using Git provider the following commands are issued:
> [INFO] Checking out the project to perform the release ...
> [INFO] Executing: /bin/sh -c cd /Users/pettermahlen/git/sas-client/target &&
git clone git://git.shopzilla.com/site/client/sas-client /Users/pettermahlen/git/sas-client/target/checkout
> [INFO] Working directory: /Users/pettermahlen/git/sas-client/target
> [INFO] Executing: /bin/sh -c cd /Users/pettermahlen/git/sas-client/target/checkout &&
git pull git://git.shopzilla.com/site/client/sas-client tag root-5.18-uk
> [INFO] Working directory: /Users/pettermahlen/git/sas-client/target/checkout
> If the branch that is being released has conflicts (that cannot be automatically resolved)
with the current HEAD at the remote server, the 'pull' with fail due to merge conflicts. A
manual execution can look like:
> [pettermahlen@Petters-MacBook-Pro target (uk-release)]$ git clone git://git.shopzilla.com/site/client/sas-client
/Users/pettermahlen/git/sas-client/target/checkout
> Initialized empty Git repository in /Users/pettermahlen/git/sas-client/target/checkout/.git/
> remote: Counting objects: 72993, done.
> remote: Compressing objects: 100% (18392/18392), done.
> remote: Total 72993 (delta 40752), reused 71454 (delta 39845)
> Receiving objects: 100% (72993/72993), 38.22 MiB | 2724 KiB/s, done.
> Resolving deltas: 100% (40752/40752), done.
> [pettermahlen@Petters-MacBook-Pro target (uk-release)]$ cd checkout/
> [pettermahlen@Petters-MacBook-Pro checkout (master)]$ git pull git://git.shopzilla.com/site/client/sas-client
tag root-5.18-uk
> Auto-merging client/pom.xml
> CONFLICT (content): Merge conflict in client/pom.xml
> Auto-merging core/pom.xml
> CONFLICT (content): Merge conflict in core/pom.xml
> Auto-merging model/pom.xml
> Pull does a fetch and a merge with what is currently checked out. A potential fix would
be to rather than the 'git pull' command issue the following:
> git checkout <scm.tag>
> That's what I did to get past this situation, and I believe that should work as a general
solution.

-- 
This message is automatically generated by JIRA.
-
If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa
-
For more information on JIRA, see: http://www.atlassian.com/software/jira

       

Mime
View raw message