[cmake-developers] Automatically deleted branch when merged to next?
Brad King
brad.king at kitware.com
Mon May 23 11:45:58 EDT 2011
On 05/21/2011 06:43 AM, Eric Noulard wrote:
> Just curious but my last stage-->next merge triggered this:
>
> Fetching upstream next
> Merge topic 'CPackRPM-fixForAIX' into next
>
> db45b10 CPack make RPM work on AIX. fix #0012183 merge patch from Pasi Valminen
> 41c83c1 KWSys Nightly Date Stamp
> Pushing upstream next
> To git at cmake.org:cmake.git
> Deleting fully merged topic 'CPackRPM-fixForAIX' (db45b10) from stage.
>
> The very last part is new to me.
> Was it done to avoid several may-be-wrong re-merge using the same branch?
>
> Does it imply that a stage branch which has been merged to next is to
> be considered over?
> Say that I want to push my merged branch forward?
> Shall I push and merge again or shall I start over with a new branch
> using a different name?
Ignore it. It was a bug on server's stage logic which I've now fixed.
Ironically I introduced the bug late last week while adding unit tests
for the stage scripts. My fix includes a test for this case ;)
I also restored your topic. It's still in next but not yet in master
as usual.
Thanks,
-Brad
More information about the cmake-developers
mailing list