On Sun, Aug 21, 2016 at 01:44:55PM +1000, Ian Wadham wrote:
> If you are going to fix a bug, you need to retrieve the new branch
> from central and make the same fix in two branches. I can never
> remember exactly how to do that… ;-)
Commit the fix in one branch, and cherry-pick that commit into
On Mon, Aug 22, 2016 at 10:57 AM, Mojca Miklavec wrote:
> On 20 August 2016 at 02:19, Ryan Schmidt wrote:
> >
> > https://trac.macports.org/wiki/WorkingWithGit
>
> We should add this:
> http://stackoverflow.com/questions/927358/how-to-undo-
> last-commits-in-git#927386
> to:
> https://tra
On 20 August 2016 at 02:19, Ryan Schmidt wrote:
>
> https://trac.macports.org/wiki/WorkingWithGit
We should add this:
http://stackoverflow.com/questions/927358/how-to-undo-last-commits-in-git#927386
to:
https://trac.macports.org/wiki/WorkingWithGit#revert
Currently the third paragraph so
On 21 August 2016 at 22:47, Fred Wright wrote:
> On Sat, 20 Aug 2016, Brandon Allbery wrote:
>> On Sat, Aug 20, 2016 at 11:44 PM, Ian Wadham wrote:
>>
>> > Fork the repo??
>>
>> github expects you to do this, yes. I don't actually recommend it because
>> keeping up to date with the original repo's
> On Aug 21, 2016, at 4:47 PM, Fred Wright wrote:
>
>> On Sat, 20 Aug 2016, Ian Wadham wrote:
>>
>> I don't know if this applies to Macports, but KDE did a lot of splitting of
>> SVN
>> "module" repositories into individual project repositories on git. For
>> example,
>> the KDE Games module
On Sat, 20 Aug 2016, Ian Wadham wrote:
> On 20/08/2016, at 1:24 PM, Lawrence Vel�zquez wrote:
> > We'll actually be using svn2git for the migration, so in a very real sense
> > we have you (collectively) to thank :)
> >
> > https://techbase.kde.org/Projects/MoveToGit/UsingSvn2Git
That was broke
> On Aug 20, 2016, at 11:55 PM, Brandon Allbery wrote:
>
>> On Sat, Aug 20, 2016 at 11:44 PM, Ian Wadham wrote:
>> Fork the repo??
>
> github expects you to do this, yes. I don't actually recommend it because
> keeping up to date with the original repo's a PITA (and *not* automated in
> any w
On Sat, Aug 20, 2016 at 11:44 PM, Ian Wadham wrote:
> Fork the repo??
github expects you to do this, yes. I don't actually recommend it because
keeping up to date with the original repo's a PITA (and *not* automated in
any way. https://help.github.com/articles/syncing-a-fork/ is annoyingly
manu
On 20/08/2016, at 11:51 PM, Ryan Schmidt wrote:
>
> On Aug 19, 2016, at 10:24 PM, Lawrence Velázquez wrote:
>
>> Any documentation we write should be written specifically for developers
>>
>> 1. who are accustomed to using Subversion, and
>> 2. want to translate *their MacPorts workfl
On 20/08/2016, at 1:24 PM, Lawrence Velázquez wrote:
>> On Aug 19, 2016, at 11:16 PM, Ian Wadham wrote:
>> As a KDE developer (and spectator of the changeover from svn to git) I have
>> found
>> this cheat sheet very useful, but not quite covering all situations I have
>> encountered.
>> htt
I'm familiar with tig and gitk, if anyone needs assistance with those.
On 08/19/2016 09:49 PM, Mark Anderson wrote:
> I use git (and Github Enterprise) in my day to day work. I can help out.
>
> Another good (free (as in beer)) client is SourceTree
> https://www.sourcetreeapp.com/
___
On Aug 19, 2016, at 10:24 PM, Lawrence Velázquez wrote:
> Any documentation we write should be written specifically for developers
>
> 1. who are accustomed to using Subversion, and
> 2. want to translate *their MacPorts workflow* to Git.
>
> We shouldn't expend effort rewriting a s
> On Aug 20, 2016, at 12:47 AM, Ian Wadham wrote:
>
> Hi Lawrence,
>
> On 20/08/2016, at 1:24 PM, Lawrence Velázquez wrote:
>>> On Aug 19, 2016, at 11:16 PM, Ian Wadham wrote:
>>>
>>> Qt and KDE moved from svn to git a while back. IIRC it was quite an effort
>>> for a
>>> few individuals to
Hi Ian,
> On Aug 20, 2016, at 1:47 AM, Ian Wadham wrote:
>
> I don't know if this applies to Macports, but KDE did a lot of splitting of
> SVN
> "module" repositories into individual project repositories on git. For
> example,
> the KDE Games module on SVN went from one repository to about 40
Hi Lawrence,
On 20/08/2016, at 1:24 PM, Lawrence Velázquez wrote:
>> On Aug 19, 2016, at 11:16 PM, Ian Wadham wrote:
>>
>> Qt and KDE moved from svn to git a while back. IIRC it was quite an effort
>> for a
>> few individuals to port all the repositories across and preserve all the
>> history
> On Aug 19, 2016, at 11:20 PM, Brandon Allbery wrote:
>
>> On Fri, Aug 19, 2016 at 11:16 PM, Ian Wadham wrote:
>>
>> Qt and KDE moved from svn to git a while back. IIRC it was quite an effort
>> for a
>> few individuals to port all the repositories across and preserve all the
>> history.
>>
> On Aug 19, 2016, at 11:16 PM, Ian Wadham wrote:
>
> Qt and KDE moved from svn to git a while back. IIRC it was quite an effort
> for a
> few individuals to port all the repositories across and preserve all the
> history.
> They had to write lots of scripts and check all the results. I hope
On Fri, Aug 19, 2016 at 11:16 PM, Ian Wadham wrote:
> Qt and KDE moved from svn to git a while back. IIRC it was quite an
> effort for a
> few individuals to port all the repositories across and preserve all the
> history.
> They had to write lots of scripts and check all the results. I hope it
On 20/08/2016, at 11:49 AM, Mark Anderson wrote:
> I use git (and Github Enterprise) in my day to day work. I can help out.
>
> Another good (free (as in beer)) client is SourceTree
> https://www.sourcetreeapp.com/
Qt and KDE moved from svn to git a while back. IIRC it was quite an effort fo
I use git (and Github Enterprise) in my day to day work. I can help out.
Another good (free (as in beer)) client is SourceTree
https://www.sourcetreeapp.com/
—Mark
___
Mark E. Anderson
On Fri, Aug 19, 2016 at 8:19 PM, Ryan Schmidt
wrote:
> Here are some resources GitHub re
20 matches
Mail list logo
