search

cms-sw / cms-git-tools

CMS Git Helpers
34 stars 26 forks source link

Allow reuse of topic commands #90

Closed kpedro88 closed 6 years ago

kpedro88 commented 6 years ago

Currently, trying to reuse any of the cms-...-topic commands with the same remote branch produces error messages like fatal: A branch named 'foo_backup' already exists. or fatal: A branch named 'foo' already exists..

The easiest way to fix this is just to overwrite the branch and the backup branch by default (assuming that if the user wants to keep any of these branches, they can rename them, or change the name of the backup branch).

Also noticed that cms-checkout-topic was making a backup branch for no reason (it's not supposed to - the relevant arguments aren't shown in the usage), so disabled that.

kpedro88 commented 6 years ago

@smuzaffar does the bot have an issue? it seems odd that it marked this PR as fully signed right away...

smuzaffar commented 6 years ago

ping cmsbot?

cmsbuild commented 6 years ago

A new Pull Request was created by @kpedro88 (Kevin Pedro) for branch master.

@cmsbuild, @smuzaffar, @gudrutis, @mrodozov can you please review it and eventually sign? Thanks. You can sign-off by replying to this message having '+1' in the first line of your reply. You can reject by replying to this message having '-1' in the first line of your reply.

external issue cms-sw/cmsdist#3622

smuzaffar commented 6 years ago

thanks @kpedro88 , yes there was an issue with bot. I was not treating this repo as one of valid external repos. Issue is fixed now.