Hi Miller,
I generated a branch of the deken plugin git repository with only the deken-plugin.tcl file changes in it:
https://github.com/pure-data/deken/tree/deken-plugin-only
I rebased it onto your Pure Data master and pushed it to GitHub here:
https://github.com/pure-data/pure-data/tree/deken-plugin-history-merged
To merge this into Pd you can paste the following into a terminal window inside your pure-data repository working copy:
# add github as a remote git remote add github git@github.com:pure-data/pure-data.git # fetch the github remote's branches git fetch github # merge the deken-plugin-history-merged branch git merge deken-plugin-history-merged
This will merge the 114 commits that lead to deken-plugin.tcl into the mainline Pd commit history linked to tcl/pd_deken.tcl thereby preserving the full commit history of the deken plugin changes. The resulting tcl/pd_deken.tcl is exactly the same as the one currently in your repository except that it has the commit history attached.
You can view the full log of the changes to the plugin once merged as follows:
git log --follow tcl/pd_deken.tcl
I hope you'll consider doing this. Git history is important as an archival and code-history preserving mechanism - useful to futurepeople. They will examine our commit histories in minute detail from the comfort of their hover-domes I am sure! Also I want people to see my name many times in Pd's commit history so that they may know my greatness.
Cheers,
Chris.
Still a git newbie...
I added github as a remote OK, but then "git fetch github" doesn;t seem to get me anything. Also tried "git fetch github deken-plugin-history-merged" which prints out:
From github.com:pure-data/pure-data
* branch deken-plugin-history-merged -> FETCH_HEAD
but then I get:
[msp@fuzz pd]$ git branch 0.42 0.43 0.45 0.46 m-audio-workaround * master tmp
So I think there's something I'm not getting...
thanks Miller
On Tue, Nov 17, 2015 at 10:16:48AM +0800, Chris McCormick wrote:
Hi Miller,
I generated a branch of the deken plugin git repository with only the deken-plugin.tcl file changes in it:
https://github.com/pure-data/deken/tree/deken-plugin-only
I rebased it onto your Pure Data master and pushed it to GitHub here:
https://github.com/pure-data/pure-data/tree/deken-plugin-history-merged
To merge this into Pd you can paste the following into a terminal window inside your pure-data repository working copy:
# add github as a remote git remote add github git@github.com:pure-data/pure-data.git # fetch the github remote's branches git fetch github # merge the deken-plugin-history-merged branch git merge deken-plugin-history-merged
This will merge the 114 commits that lead to deken-plugin.tcl into the mainline Pd commit history linked to tcl/pd_deken.tcl thereby preserving the full commit history of the deken plugin changes. The resulting tcl/pd_deken.tcl is exactly the same as the one currently in your repository except that it has the commit history attached.
You can view the full log of the changes to the plugin once merged as follows:
git log --follow tcl/pd_deken.tcl
I hope you'll consider doing this. Git history is important as an archival and code-history preserving mechanism - useful to futurepeople. They will examine our commit histories in minute detail from the comfort of their hover-domes I am sure! Also I want people to see my name many times in Pd's commit history so that they may know my greatness.
Cheers,
Chris.
Hi Miller,
On 17/11/15 10:44, Miller Puckette wrote:
Still a git newbie...
I only know just enough to make other peoples' computers explode.
I added github as a remote OK, but then "git fetch github" doesn;t seem to get me anything. Also tried "git fetch github deken-plugin-history-merged" which prints out:
From github.com:pure-data/pure-data
- branch deken-plugin-history-merged -> FETCH_HEAD
but then I get:
[msp@fuzz pd]$ git branch 0.42 0.43 0.45 0.46 m-audio-workaround
- master tmp
So I think there's something I'm not getting...
Ok, I think the final step would be:
git checkout deken-plugin-history-merged
And then if you like it:
git checkout master git merge deken-plugin-history-merged
Before you do this I'd be more comfortable if somebody else on this list verified that I am not leading us into a stupid place. IOhannes?
Cheers,
Chris.
Well, I just threw caution to the winds and tried it. Now mirrored on git://git.code.sf.net/p/pure-data/pure-data if you want to see what damage I might have caused :)
M
On Tue, Nov 17, 2015 at 11:20:33AM +0800, Chris McCormick wrote:
Hi Miller,
On 17/11/15 10:44, Miller Puckette wrote:
Still a git newbie...
I only know just enough to make other peoples' computers explode.
I added github as a remote OK, but then "git fetch github" doesn;t seem to get me anything. Also tried "git fetch github deken-plugin-history-merged" which prints out:
From github.com:pure-data/pure-data
- branch deken-plugin-history-merged -> FETCH_HEAD
but then I get:
[msp@fuzz pd]$ git branch 0.42 0.43 0.45 0.46 m-audio-workaround
- master tmp
So I think there's something I'm not getting...
Ok, I think the final step would be:
git checkout deken-plugin-history-merged
And then if you like it:
git checkout master git merge deken-plugin-history-merged
Before you do this I'd be more comfortable if somebody else on this list verified that I am not leading us into a stupid place. IOhannes?
Cheers,
Chris.
Pd-dev mailing list Pd-dev@lists.iem.at http://lists.puredata.info/listinfo/pd-dev
#yolo
Pd still compiles for some reason.
Looks good to me, thanks!
Cheers,
Chris.
On 17/11/15 11:38, Miller Puckette wrote:
Well, I just threw caution to the winds and tried it. Now mirrored on git://git.code.sf.net/p/pure-data/pure-data if you want to see what damage I might have caused :)
M
On Tue, Nov 17, 2015 at 11:20:33AM +0800, Chris McCormick wrote:
Hi Miller,
On 17/11/15 10:44, Miller Puckette wrote:
Still a git newbie...
I only know just enough to make other peoples' computers explode.
I added github as a remote OK, but then "git fetch github" doesn;t seem to get me anything. Also tried "git fetch github deken-plugin-history-merged" which prints out:
From github.com:pure-data/pure-data
- branch deken-plugin-history-merged -> FETCH_HEAD
but then I get:
[msp@fuzz pd]$ git branch 0.42 0.43 0.45 0.46 m-audio-workaround
- master tmp
So I think there's something I'm not getting...
Ok, I think the final step would be:
git checkout deken-plugin-history-merged
And then if you like it:
git checkout master git merge deken-plugin-history-merged
Before you do this I'd be more comfortable if somebody else on this list verified that I am not leading us into a stupid place. IOhannes?
Cheers,
Chris.
Pd-dev mailing list Pd-dev@lists.iem.at http://lists.puredata.info/listinfo/pd-dev
I've just tried 0.46.7 from the github ; pd_deken.tcl should be added into tcl/Makefile.am in order to install correctly. Apart from that, thanks a lot for this great addon !
2015-11-17 5:06 GMT+01:00 Chris McCormick chris@mccormick.cx:
#yolo
Pd still compiles for some reason.
Looks good to me, thanks!
Cheers,
Chris.
On 17/11/15 11:38, Miller Puckette wrote:
Well, I just threw caution to the winds and tried it. Now mirrored on git://git.code.sf.net/p/pure-data/pure-data if you want to see what damage I might have caused :)
M
On Tue, Nov 17, 2015 at 11:20:33AM +0800, Chris McCormick wrote:
Hi Miller,
On 17/11/15 10:44, Miller Puckette wrote:
Still a git newbie...
I only know just enough to make other peoples' computers explode.
I added github as a remote OK, but then "git fetch github" doesn;t seem
to get me anything. Also tried "git fetch github deken-plugin-history-merged" which prints out:
From github.com:pure-data/pure-data
- branch deken-plugin-history-merged -> FETCH_HEAD
but then I get:
[msp@fuzz pd]$ git branch 0.42 0.43 0.45 0.46 m-audio-workaround
- master tmp
So I think there's something I'm not getting...
Ok, I think the final step would be:
git checkout deken-plugin-history-merged
And then if you like it:
git checkout master git merge deken-plugin-history-merged
Before you do this I'd be more comfortable if somebody else on this list verified that I am not leading us into a stupid place. IOhannes?
Cheers,
Chris.
Pd-dev mailing list Pd-dev@lists.iem.at http://lists.puredata.info/listinfo/pd-dev
Pd-dev mailing list Pd-dev@lists.iem.at http://lists.puredata.info/listinfo/pd-dev
-
Antoine Rousseau -
Chris McCormick -
Miller Puckette