yeah you probably should of done it before you make any eden changes so git
could of tracked the differences between them
On Thu, May 12, 2011 at 6:11 PM, Big Noid <[email protected]> wrote:
> I know you can do this if both branches are using either git or svn. I
> tried to import my svn branch in git by using git-svn, but that never
> worked, so I just made a new repo on git. I don't think I can import the
> changes automatic then.
>
>
> 2011/5/12 Jezz_X <[email protected]>
>
>> Yeah that the reason though that git and svn give you tools to handle this
>> and magically merge from one branch back to another without having to
>> manually patch each version
>>
>> On Thu, May 12, 2011 at 5:07 PM, Big Noid <[email protected]> wrote:
>>
>>> That's good to hear, I can imagine there are gonna be a lot more pull
>>> request coming period for other skins that made changes for the eden
>>> version.
>>> A big disadvantage of maintaining two version on different version
>>> control systems is that sometimes you fix a bug in one version, but forget
>>> to add it to the second one. The textures are a example of this and today I
>>> added another fix that was in the dharma version but not in eden-pre. Final
>>> revision (if you can call it that in git) for pull is now 85749dc.
>>>
>>>
>>> Thx.
>>>
>>> 2011/5/12 Cory Fields <[email protected]>
>>>
>>>> On Thu, May 12, 2011 at 4:22 AM, Cory Fields <[email protected]> wrote:
>>>> > On Wed, May 11, 2011 at 1:39 PM, Big Noid <[email protected]>
>>>> wrote:
>>>> >> Hi,
>>>> >> This is the version of Aeon Nox for eden-pre (not dharma!). I decided
>>>> to
>>>> >> branch off to git for this version of the skin. The version for the
>>>> dharma
>>>> >> repo is still maintained on svn.
>>>> >> Because of all the new possibilities of eden that I tried to
>>>> incorporate,
>>>> >> you should probably review this as a new skin entry. Don't compare it
>>>> to the
>>>> >> svn version of the skin please.
>>>> >> On a different note. Some features that I added in this version that
>>>> are
>>>> >> not dependent on the new skinning engine, I backported to the dharma
>>>> version
>>>> >> of the skin. Is that gonna be a problem when I do a pull request in
>>>> the
>>>> >> future for that version of the skin?
>>>> >
>>>> > That's exactly the idea, you've got it spot-on. Branches allow you to
>>>> > support the stable version while adding new-feature support to
>>>> > bleeding-edge. We encourage everyone to submit pull requests for both.
>>>> >
>>>> > Reviewing now.
>>>> >
>>>> > Regards,
>>>> > Cory
>>>> >
>>>>
>>>> I'm inclined to commit this as-is simply because I'm so amazed that
>>>> you seem to have followed the requirements perfectly, but let's do a
>>>> few things first to avoid a quick follow-up version:
>>>>
>>>> 1. I see there's a newer revision now and assume you'd like this pulled
>>>> instead?
>>>> 2. No images smaller than 4x4 please:
>>>> Warning: ./media/common/darkgrey.png has dimensions of 1x1
>>>> Warning: ./media/common/blank.png has dimensions of 1x1
>>>> 3. The skin will likely fail to install from the repo due to missing
>>>> script deps. As Arne said, let's just go ahead and commit it this way,
>>>> then we can bug the authors to submit to eden-pre.
>>>>
>>>> Keep up the good work, you make my job easy!
>>>> Cory
>>>>
>>>
>>>
>>>
>>> ------------------------------------------------------------------------------
>>> Achieve unprecedented app performance and reliability
>>> What every C/C++ and Fortran developer should know.
>>> Learn how Intel has extended the reach of its next-generation tools
>>> to help boost performance applications - inlcuding clusters.
>>> http://p.sf.net/sfu/intel-dev2devmay
>>> _______________________________________________
>>> Xbmc-addons mailing list
>>> [email protected]
>>> https://lists.sourceforge.net/lists/listinfo/xbmc-addons
>>>
>>>
>>
>
------------------------------------------------------------------------------
Achieve unprecedented app performance and reliability
What every C/C++ and Fortran developer should know.
Learn how Intel has extended the reach of its next-generation tools
to help boost performance applications - inlcuding clusters.
http://p.sf.net/sfu/intel-dev2devmay
_______________________________________________
Xbmc-addons mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xbmc-addons
