Loading...
 

Tikiwiki-devel (mailman list mirror)


Merging from a branch with PhpStorm (was Merging in phpStorm)

posts: 3190 United Kingdom

Hi Chealer

Sorry for the late reply, found this draft - is it still an issue for you? I didn’t really understand the question i’m afraid (need things in very easy to follow steps at the moment, snowed under... ;)

jonny

> On 29 Aug 2017, at 17:52, Cloutier, Philippe (DGARI-Consultant) <Philippe.Cloutier.externe@mern-mffp.gouv.qc.ca> wrote:

>
>> -----Message d’origine-----
>> De : Cloutier, Philippe (DGARI-Consultant)
>> Envoyé : 24 août 2017 14:33
>> À : Tiki developers <tikiwiki-devel@lists.sourceforge.net>
>> Objet : Re: Merging in phpStorm
>>
>> Many thanks Jonny, I managed to merge this way with a couple adjustments which are documented
>> on https://dev.tiki.org/PhpStorm#How_to_merge
>>
>
> I have another issue if I try merging from a branch with PhpStorm 2017.2.1. Merging from trunk does not have this problem, but if I create a branch for 17 then try Merge From... with “17.x...”, another menu opens prompting me to select a file in 17.x, so I can’t merge. I can do it by selecting “branches...”, and then 17.x instead.
>
> Am I doing something wrong?

Sorry, i’m lost - you can’t use this to merge 17 into 17...


>
>>
>> Jonny Bradley wrote:
>>> Hi Lindon, replying on the dev list for wider viewing :-)
>>>
>>> Seems that the way i do merging of single commits in phpStorm isn’t in their documentation, i think i
>> just worked it out several versions ago (don’t like manuals mostly ;)
>>>
>>> So here’s what i do... let’s say i want to merge a commit from trunk into 14.x...
>>>
>>> First thing to do is configure the branches in your project (you need that also to do “Compare with
>> branch...” which is really handy too.
>>>
>>> https://www.jetbrains.com/phpstorm/help/configure-subversion-branches.html
>>>
>>> It should work out where trunk is, and last time i did it it added branches, mods, third_party etc as
>> branch locations, you can remove everything apart from branches from there (the lower box).
>>>
>>> To do a merge, go back to the Changes panel -> Working Copy info pane where the config branches
>> link was and just under it is “Merge from...” - click that and the little drop down branch menu appears,
>> click “trunk” (in this case) and you get the “Select Merge Variant” dialog, with “Quick Manual Select”
>> button, should be obvious from there (?)
>>>
>>> The other two options (merge all, only any use when merging an experimental branch back into
>> trunk, but i’ve never used it, looked too scary!) and Select with pre-filter, which takes ages and ages
>> on tiki, probably due to our extensive history (and svn being a bit rubbish at this).
>>>
>>> Hope that helps, odd that it’s not on their documentation (afaics)
>>>
>>> jonny
>>>
>>> P.S. Compare with branch instructions are here
>> https://www.jetbrains.com/phpstorm/help/comparing-with-branch.html
>>>
>>>

>>>> On 27 Feb 2015, at 01:51, lindon <lindon@...> wrote:

>>>>
>>>> Hi Jonny - cool, maybe I’ll learn something here - what is the merge -> quick select method?
>> Looked for it in the help, etc. and couldn’t find it. I’m sure it’s right in front of my nose!
>>>> Thanks again,
>>>> lindon
>>>>
>>>>
>>>>> On Feb 26, 2015, at 6:55 AM, Jonny Bradley <jonny@...> wrote:
>>>>>
>>>>> Hi Lindon
>>>>>
>>>>> Thanks for that, but i think doing a backport would have been fine, as long as it’s 100% clean (i.e.
>> use phpStorm’s merge -> quick select method).
>>>>>
>>>>> Never mind though, many thanks for all this icon work! :-)
>>>>>
>>>>> jonny
>>>>>
>>>>>
>>>>>
>>>>>> On 26 Feb 2015, at 03:44, lindonb@... wrote:
>>>>>>
>>>>>> Revision: 54120
>>>>>> http://sourceforge.net/p/tikiwiki/code/54120
>>>>>> Author: lindonb
>>>>>> Date: 2015-02-26 03:44:02 +0000 (Thu, 26 Feb 2015)
>>>>>> Log Message:
>>>>>> -----------
>>>>>> revert r54117 - oops, didn’t realize we had branched
>>>>>>
>>>>>> Revision Links:
>>>>>> --------------
>>>>>> http://sourceforge.net/p/tikiwiki/code/54117
>>>>>>
>>>>>> Modified Paths:
>>>>>> --------------
>>>>>> trunk/templates/tiki-view_forum_thread.tpl
>
> ------------------------------------------------------------------------------
> Check out the vibrant tech community on one of the world’s most
> engaging tech sites, Slashdot.org! http://sdm.link/slashdot
> ___
> TikiWiki-devel mailing list
> TikiWiki-devel at lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel
>


------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world’s most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
___
TikiWiki-devel mailing list
TikiWiki-devel at lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel

Why Register?

Register at tiki.org and you'll be able to use the account at any *.tiki.org site, thanks to the InterTiki feature. A valid email address is required to receive site notifications and occasional newsletters. You can opt out of these items at any time.