Performing a Maven release with Hudson Mercurial Plugin

[Jan Sorensen]

On Tue, May 4, 2010 at 16:21, Jeroen Rosenberg <jeroenr at novadoc.nl> wrote:
>
> -----Original Message-----
> From: Matt Mackall [mailto:mpm at selenic.com]
> Sent: dinsdag 4 mei 2010 16:08
> To: Dirkjan Ochtman
> Cc: Jeroen Rosenberg; mercurial at selenic.com
> Subject: Re: Performing a Maven release with Hudson Mercurial Plugin
>
> On Tue, 2010-05-04 at 10:39 +0200, Dirkjan Ochtman wrote:
>> On Tue, May 4, 2010 at 10:35, Jeroen Rosenberg <jeroenr at novadoc.nl> wrote:
>> > Thanks for you response. Well, the error diagnostics on stdout gave me the following message:
>> >
>> > abort: push creates new remote heads on branch 'default'!
>> >
>> > I figured that this might have something to do with having uncommitted changes made by the Hudson Mercurial Plugin which prevents me from pushing. The output from "hg status" gave me:
>> >
>> > ? pom.xml.releaseBackup
>> > ? release.properties
>> >
>> > So, I added those files to my .hgignore file and committed. After I did this, I was able to push to the remote server. Now I can also perform Maven releases from Hudson without problems. Still I think this isn't a very neat solution. I also posted this on Hudson forums.
>>
>> The push abortion isn't related to the ignored files, but has to do
>> with the fact that you likely had new csets on the server side that
>> the client side hadn't seen yet.
>
>> In other words, you're missing some basic understanding of Mercurial
>> concepts and terminology and you're likely to be eaten by a grue. Please
>> take a look at the book:
>
>> http://hgbook.red-bean.com/read/a-tour-of-mercurial-merging-work.html
>
>> --
>> Mathematics is the supreme nostalgia of our time.
>
> I understand the concept of merging. I also understand that in such a situation you need to (pull and)
> merge locally before pushing. The thing is, the push command is part of a sequence of commands
> executed by the Hudson Mercurial Plugin, so merging is not an option in my case. By ignoring these
> files I apparently prevented conflicts so no merge is necessary anymore. I think it's a plugin specific
> problem... thanks anyway.

The Maven release command will create tags and modify pom files. These
changes will be committed. If you are not at a head when you do the
release you will get a new head, which will cause push to fail.

Cheers,
Jan Sorensen
aragost Trifork