You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by Imran M Yousuf <im...@gmail.com> on 2008/11/12 07:39:47 UTC
[URGENT] How make maintenance release from release branch using GIT SCM
Hi,
I have a project (http://repo.or.cz/w/smart-dao.git) where I have 2
working branches (master and release-0.3). Now I want to make a
maintenance release (release-0.3) so I am doing it from the
appropriate branch. Now when I do 'mvn release:prepare' it succeeds.
But when I do 'mvn release:perform' it fails.
I have looked at it closely and noticed that prepare is performed from
the branch I am in but perform tries to check out from the tagged base
and merge into 'master'. Then it gets a conflict and aborts, because
version in master has been changed since. How can I get it to work
now? That is, I want the release to be performed from release-0.3
branch instead of master, how I can specify this?
--
Imran M Yousuf
Entrepreneur & Software Engineer
Smart IT Engineering
Dhaka, Bangladesh
Blog: http://imyousuf-tech.blogs.smartitengineering.com/
Mobile: +880-1711402557
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
Re: [URGENT] How make maintenance release from release branch using GIT SCM
Posted by Imran M Yousuf <im...@gmail.com>.
On Wed, Nov 12, 2008 at 12:39 PM, Imran M Yousuf <im...@gmail.com> wrote:
> Hi,
>
> I have a project (http://repo.or.cz/w/smart-dao.git) where I have 2
> working branches (master and release-0.3). Now I want to make a
> maintenance release (release-0.3) so I am doing it from the
> appropriate branch. Now when I do 'mvn release:prepare' it succeeds.
> But when I do 'mvn release:perform' it fails.
>
Currently I am doing the release:perform manually by hand. I would
really like to know how release:perform would work. BTW the update is
the command trying to be executed is 'git pull origin tag' where as it
should actually be - 'git checkout tag'.
Best regards,
Imran
> I have looked at it closely and noticed that prepare is performed from
> the branch I am in but perform tries to check out from the tagged base
> and merge into 'master'. Then it gets a conflict and aborts, because
> version in master has been changed since. How can I get it to work
> now? That is, I want the release to be performed from release-0.3
> branch instead of master, how I can specify this?
>
> --
> Imran M Yousuf
> Entrepreneur & Software Engineer
> Smart IT Engineering
> Dhaka, Bangladesh
> Blog: http://imyousuf-tech.blogs.smartitengineering.com/
> Mobile: +880-1711402557
>
--
Imran M Yousuf
Entrepreneur & Software Engineer
Smart IT Engineering
Dhaka, Bangladesh
Email: imran@smartitengineering.com
Blog: http://imyousuf-tech.blogs.smartitengineering.com/
Mobile: +880-1711402557
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
Re: [URGENT] How make maintenance release from release branch using GIT SCM
Posted by Imran M Yousuf <im...@gmail.com>.
On Wed, Nov 12, 2008 at 12:39 PM, Imran M Yousuf <im...@gmail.com> wrote:
> Hi,
>
> I have a project (http://repo.or.cz/w/smart-dao.git) where I have 2
> working branches (master and release-0.3). Now I want to make a
> maintenance release (release-0.3) so I am doing it from the
> appropriate branch. Now when I do 'mvn release:prepare' it succeeds.
> But when I do 'mvn release:perform' it fails.
>
Currently I am doing the release:perform manually by hand. I would
really like to know how release:perform would work. BTW the update is
the command trying to be executed is 'git pull origin tag' where as it
should actually be - 'git checkout tag'.
Best regards,
Imran
> I have looked at it closely and noticed that prepare is performed from
> the branch I am in but perform tries to check out from the tagged base
> and merge into 'master'. Then it gets a conflict and aborts, because
> version in master has been changed since. How can I get it to work
> now? That is, I want the release to be performed from release-0.3
> branch instead of master, how I can specify this?
>
> --
> Imran M Yousuf
> Entrepreneur & Software Engineer
> Smart IT Engineering
> Dhaka, Bangladesh
> Blog: http://imyousuf-tech.blogs.smartitengineering.com/
> Mobile: +880-1711402557
>
--
Imran M Yousuf
Entrepreneur & Software Engineer
Smart IT Engineering
Dhaka, Bangladesh
Email: imran@smartitengineering.com
Blog: http://imyousuf-tech.blogs.smartitengineering.com/
Mobile: +880-1711402557