January 10, 2012
On 2012-01-10 13:37, kntroh wrote:
> == Quote from Jacob Carlborg (doob@me.com)'s article
>> On 2012-01-10 05:01, Jesse Phillips wrote:
>>> On Monday, 9 January 2012 at 23:06:12 UTC, kntroh wrote:
>>>>> I've now moved the DWT repository to github. The old mercurial
>>>>> repository is split into several repository, all available under an
>>>>> organization: https://github.com/d-widget-toolkit
>>>>
>>>> Do I need to make my repository on github to send pull request?
>>>>
>>>> --
>>>> kntroh
>>>
>>> To make a pull request your repository must be a fork of his, or someone
>>> who forked his, on github.
>>>
>>> It is possible to merge changes from any git repository clone however,
>>> if such is available over the web.
>> What he said. It will be a lot of easier if you fork the repository on
>> github. I get an automatic email sent to me when a pull request has been
>> made and I can easily look at the commits and diffs on github.
>
> I understand.
> I will create repository in github
> from fork of official and my repository in bitbucket
> then send pull request.
>
> --
> kntroh

You should theoretical be able to convert the mercurial repository to a git repository. Fork the new DWT repository at github and merge your changes from the mercurial repository and finally make a pull request.

Hmm, or maybe not since I've split the single mercurial repository into several git repositories. I don't know.

This git repository contains a tool that can convert a mercurial repository to a git repository, it's the same one I've used:

http://repo.or.cz/w/fast-export.git

-- 
/Jacob Carlborg
January 10, 2012
On 2012-01-10 13:37, kntroh wrote:
> == Quote from Jacob Carlborg (doob@me.com)'s article
>> On 2012-01-10 05:01, Jesse Phillips wrote:
>>> On Monday, 9 January 2012 at 23:06:12 UTC, kntroh wrote:
>>>>> I've now moved the DWT repository to github. The old mercurial
>>>>> repository is split into several repository, all available under an
>>>>> organization: https://github.com/d-widget-toolkit
>>>>
>>>> Do I need to make my repository on github to send pull request?
>>>>
>>>> --
>>>> kntroh
>>>
>>> To make a pull request your repository must be a fork of his, or someone
>>> who forked his, on github.
>>>
>>> It is possible to merge changes from any git repository clone however,
>>> if such is available over the web.
>> What he said. It will be a lot of easier if you fork the repository on
>> github. I get an automatic email sent to me when a pull request has been
>> made and I can easily look at the commits and diffs on github.
>
> I understand.
> I will create repository in github
> from fork of official and my repository in bitbucket
> then send pull request.

I've converted your mercurial repository, split it and it merged cleanly. But the problem is that you have used an invalid, at least according to github, email address (devnull@localhost).

It seems to be possible to fix but I'm not sure if that would mess up the history. I can give it a try with some random address to see if it works. If it works I would need your email address, preferably the one you're going to use to register to github. It's possible to register several email addresses with one account at github.

-- 
/Jacob Carlborg
January 11, 2012
== Quote from Jacob Carlborg (doob@me.com)'s article
> On 2012-01-10 13:37, kntroh wrote:
>> == Quote from Jacob Carlborg (doob@me.com)'s article
>>> On 2012-01-10 05:01, Jesse Phillips wrote:
>>>> On Monday, 9 January 2012 at 23:06:12 UTC, kntroh wrote:
>>>>>> I've now moved the DWT repository to github. The old mercurial repository is split into several repository, all available under an organization: https://github.com/d-widget-toolkit
>>>>>
>>>>> Do I need to make my repository on github to send pull request?
>>>>>
>>>>> --
>>>>> kntroh
>>>>
>>>> To make a pull request your repository must be a fork of his, or someone who forked his, on github.
>>>>
>>>> It is possible to merge changes from any git repository clone however, if such is available over the web.
>>> What he said. It will be a lot of easier if you fork the repository on github. I get an automatic email sent to me when a pull request has been made and I can easily look at the commits and diffs on github.
>>
>> I understand.
>> I will create repository in github
>> from fork of official and my repository in bitbucket
>> then send pull request.
>
> I've converted your mercurial repository, split it and it merged cleanly. But the problem is that you have used an invalid, at least according to github, email address (devnull@localhost).
>
> It seems to be possible to fix but I'm not sure if that would mess up the history. I can give it a try with some random address to see if it works. If it works I would need your email address, preferably the one you're going to use to register to github. It's possible to register several email addresses with one account at github.

Thanks for your works.
I've created account at github. Please use knt.roh@gmail.com .

--
kntroh
https://github.com/kntroh
January 11, 2012
On 2012-01-11 11:06, kntroh wrote:
> == Quote from Jacob Carlborg (doob@me.com)'s article
>> It seems to be possible to fix but I'm not sure if that would mess up
>> the history. I can give it a try with some random address to see if it
>> works. If it works I would need your email address, preferably the one
>> you're going to use to register to github. It's possible to register
>> several email addresses with one account at github.
>
> Thanks for your works.
> I've created account at github. Please use knt.roh@gmail.com .

Ok, I'll take care of that tonight.

-- 
/Jacob Carlborg
January 11, 2012
On 2012-01-11 11:06, kntroh wrote:
> Thanks for your works.
> I've created account at github. Please use knt.roh@gmail.com .

I've merged your commits now. It says that you are the author and I am the committer, I hope that's ok. You can now merge from upstream to get the latest changes.

-- 
/Jacob Carlborg
January 12, 2012
== Quote from Jacob Carlborg (doob@me.com)'s article
> I've merged your commits now. It says that you are the author and I am the committer, I hope that's ok. You can now merge from upstream to get the latest changes.

I cloned DWT from github. Then I ran this command.
> git submodule update --init
It failed. Submodules didn't become latest version.

Then I tried this command.
> git submodule foreach git pull origin master
It was successful. I builded my application with DWT.
That's ok.
But, is it right command?
January 12, 2012
On 2012-01-12 12:09, kntroh wrote:
> == Quote from Jacob Carlborg (doob@me.com)'s article
>> I've merged your commits now. It says that you are the author and I am
>> the committer, I hope that's ok. You can now merge from upstream to get
>> the latest changes.
>
> I cloned DWT from github. Then I ran this command.
>> git submodule update --init
> It failed. Submodules didn't become latest version.

git submodules refers to a specific commit and I haven't updated the submodules to the latest version. If you take a look at the dwt repository at github you can see a hash next to the name of the submodules. That hash refers to the commit in the repository the submoule points to.

I guess the reason for this is because an update of a repository that is a submodule shouldn't be able to break the repository that includes the submodule.

So in this case the dwt repository decides which commits the submodules should refer to.

> Then I tried this command.
>> git submodule foreach git pull origin master
> It was successful. I builded my application with DWT.
> That's ok.
> But, is it right command?

No it isn't.

-- 
/Jacob Carlborg
January 12, 2012
On 2012-01-12 12:09, kntroh wrote:
> == Quote from Jacob Carlborg (doob@me.com)'s article
>> I've merged your commits now. It says that you are the author and I am
>> the committer, I hope that's ok. You can now merge from upstream to get
>> the latest changes.
>
> I cloned DWT from github. Then I ran this command.
>> git submodule update --init
> It failed. Submodules didn't become latest version.
>
> Then I tried this command.
>> git submodule foreach git pull origin master
> It was successful. I builded my application with DWT.
> That's ok.
> But, is it right command?

When you run "git pull" in a submodule it will grab the latest version from the origin in the repository and the submodule will now refer to that commit instead.

-- 
/Jacob Carlborg
January 12, 2012
== Quote from Jacob Carlborg (doob@me.com)'s article
> When you run "git pull" in a submodule it will grab the latest version from the origin in the repository and the submodule will now refer to that commit instead.

I understand.
I ran "git pull" on each submodule (base, win32),
and checked that it was satisfactory.

--
kntroh
January 12, 2012
On 2012-01-12 14:29, kntroh wrote:
> == Quote from Jacob Carlborg (doob@me.com)'s article
>> When you run "git pull" in a submodule it will grab the latest version
>> from the origin in the repository and the submodule will now refer to
>> that commit instead.
>
> I understand.
> I ran "git pull" on each submodule (base, win32),
> and checked that it was satisfactory.

To make everything correct I need to update the submodules to the latest commit.

-- 
/Jacob Carlborg
1 2
Next ›   Last »