From alan.schmitt at polytechnique.org Thu Jun 5 09:07:08 2014 From: alan.schmitt at polytechnique.org (Alan Schmitt) Date: Thu, 05 Jun 2014 15:07:08 +0200 Subject: [Unison-hackers] Mac update In-Reply-To: <78216321-37B1-4F45-AA9B-680840BBDB14@acm.org> (Alan Shutko's message of "Thu, 29 May 2014 08:44:32 -0500") References: <78216321-37B1-4F45-AA9B-680840BBDB14@acm.org> Message-ID: On 2014-05-29 15:44, Alan Shutko writes: > The mkProjectInfo.ml file uses a subversion keyword to get the subversion revision number to put in the makefile. That doesn't exist in a git checkout, so I had to do this workaround: > > --- a/src/mkProjectInfo.ml > +++ b/src/mkProjectInfo.ml > @@ -42,7 +42,7 @@ let pointVersionOrigin = 504 (* Revision that corresponds to point version 0 *) > (* ---------------------------------------------------------------------- *) > (* You shouldn't need to edit below. *) > > -let revisionString = "$Rev$";; > +let revisionString = "$Rev: 900$";; > > let pointVersion = > Scanf.sscanf revisionString "$Rev: %d " (fun x -> x) - pointVersionOrigin;; > Modified src/strings.ml This works, thanks a lot. I'm able to build the application here. Alan From bcpierce at cis.upenn.edu Sun Jun 8 13:04:15 2014 From: bcpierce at cis.upenn.edu (Benjamin C. Pierce) Date: Sun, 8 Jun 2014 13:04:15 -0400 Subject: [Unison-hackers] Mac update In-Reply-To: References: <78216321-37B1-4F45-AA9B-680840BBDB14@acm.org> Message-ID: Looks like the new mac GUI is basically working. Should we start folding the changes back into the trunk repo? - Benjamin On Jun 5, 2014, at 9:07 AM, Alan Schmitt wrote: > On 2014-05-29 15:44, Alan Shutko writes: > >> The mkProjectInfo.ml file uses a subversion keyword to get the subversion revision number to put in the makefile. That doesn't exist in a git checkout, so I had to do this workaround: >> >> --- a/src/mkProjectInfo.ml >> +++ b/src/mkProjectInfo.ml >> @@ -42,7 +42,7 @@ let pointVersionOrigin = 504 (* Revision that corresponds to point version 0 *) >> (* ---------------------------------------------------------------------- *) >> (* You shouldn't need to edit below. *) >> >> -let revisionString = "$Rev$";; >> +let revisionString = "$Rev: 900$";; >> >> let pointVersion = >> Scanf.sscanf revisionString "$Rev: %d " (fun x -> x) - pointVersionOrigin;; >> Modified src/strings.ml > > This works, thanks a lot. I'm able to build the application here. > > Alan > _______________________________________________ > Unison-hackers mailing list > Unison-hackers at lists.seas.upenn.edu > http://lists.seas.upenn.edu/mailman/listinfo/unison-hackers -------------- next part -------------- An HTML attachment was scrubbed... URL: From ats at acm.org Sun Jun 8 21:46:16 2014 From: ats at acm.org (Alan Shutko) Date: Sun, 8 Jun 2014 20:46:16 -0500 Subject: [Unison-hackers] Mac update In-Reply-To: References: <78216321-37B1-4F45-AA9B-680840BBDB14@acm.org> Message-ID: I think so. The crash Marcus reported is still unresolved, but I don?t think that should stop merging it. I?d like to figure it out before an official release, if possible. > On Jun 8, 2014, at 12:04 PM, Benjamin C. Pierce wrote: > > Looks like the new mac GUI is basically working. Should we start folding the changes back into the trunk repo? > > - Benjamin > > From bcpierce at cis.upenn.edu Sun Jun 8 21:50:32 2014 From: bcpierce at cis.upenn.edu (Benjamin C. Pierce) Date: Sun, 8 Jun 2014 21:50:32 -0400 Subject: [Unison-hackers] Mac update In-Reply-To: References: <78216321-37B1-4F45-AA9B-680840BBDB14@acm.org> Message-ID: <60908EED-F6E2-4349-B357-46E44C34DB4C@cis.upenn.edu> OK, what?s the easiest way to package them up and replay them on the trunk? On Jun 8, 2014, at 9:46 PM, Alan Shutko wrote: > I think so. The crash Marcus reported is still unresolved, but I don?t think that should stop merging it. I?d like to figure it out before an official release, if possible. > >> On Jun 8, 2014, at 12:04 PM, Benjamin C. Pierce wrote: >> >> Looks like the new mac GUI is basically working. Should we start folding the changes back into the trunk repo? >> >> - Benjamin >> >> > > _______________________________________________ > Unison-hackers mailing list > Unison-hackers at lists.seas.upenn.edu > http://lists.seas.upenn.edu/mailman/listinfo/unison-hackers From ats at acm.org Sun Jun 8 21:56:44 2014 From: ats at acm.org (Alan Shutko) Date: Sun, 8 Jun 2014 20:56:44 -0500 Subject: [Unison-hackers] Mac update In-Reply-To: <60908EED-F6E2-4349-B357-46E44C34DB4C@cis.upenn.edu> References: <78216321-37B1-4F45-AA9B-680840BBDB14@acm.org> <60908EED-F6E2-4349-B357-46E44C34DB4C@cis.upenn.edu> Message-ID: <25D72FC9-4B8D-4C01-BB68-08CCE032E49B@acm.org> I need to spend some time looking that up. Worst case, I can send you a giant diff. There?s a way to do it if I had commit access to the svn repo, but I?d prefer a way that didn?t require that if possible. I think there might be a way for _you_ to pull down the changes and replay them. But I need to check. (I?ve used svn before, and I?ve used git, but I?ve never used them together.) > On Jun 8, 2014, at 8:50 PM, Benjamin C. Pierce wrote: > > OK, what?s the easiest way to package them up and replay them on the trunk? > > On Jun 8, 2014, at 9:46 PM, Alan Shutko wrote: > >> I think so. The crash Marcus reported is still unresolved, but I don?t think that should stop merging it. I?d like to figure it out before an official release, if possible. >> >>> On Jun 8, 2014, at 12:04 PM, Benjamin C. Pierce wrote: >>> >>> Looks like the new mac GUI is basically working. Should we start folding the changes back into the trunk repo? >>> >>> - Benjamin >>> >>> >> >> _______________________________________________ >> Unison-hackers mailing list >> Unison-hackers at lists.seas.upenn.edu >> http://lists.seas.upenn.edu/mailman/listinfo/unison-hackers > > _______________________________________________ > Unison-hackers mailing list > Unison-hackers at lists.seas.upenn.edu > http://lists.seas.upenn.edu/mailman/listinfo/unison-hackers From bcpierce at cis.upenn.edu Mon Jun 9 06:46:28 2014 From: bcpierce at cis.upenn.edu (Benjamin Pierce) Date: Mon, 9 Jun 2014 06:46:28 -0400 Subject: [Unison-hackers] Mac update In-Reply-To: <25D72FC9-4B8D-4C01-BB68-08CCE032E49B@acm.org> References: <78216321-37B1-4F45-AA9B-680840BBDB14@acm.org> <60908EED-F6E2-4349-B357-46E44C34DB4C@cis.upenn.edu> <25D72FC9-4B8D-4C01-BB68-08CCE032E49B@acm.org> Message-ID: <15E72EC0-8B57-449F-836F-329EA27BF768@cis.upenn.edu> I assume most of the changes you've made are to the GUI itself, which hasn't changed on this side. How many .ml files have changed? - B > On Jun 8, 2014, at 21:56, Alan Shutko wrote: > > I need to spend some time looking that up. > > Worst case, I can send you a giant diff. There?s a way to do it if I had commit access to the svn repo, but I?d prefer a way that didn?t require that if possible. I think there might be a way for _you_ to pull down the changes and replay them. But I need to check. (I?ve used svn before, and I?ve used git, but I?ve never used them together.) > > >> On Jun 8, 2014, at 8:50 PM, Benjamin C. Pierce wrote: >> >> OK, what?s the easiest way to package them up and replay them on the trunk? >> >>> On Jun 8, 2014, at 9:46 PM, Alan Shutko wrote: >>> >>> I think so. The crash Marcus reported is still unresolved, but I don?t think that should stop merging it. I?d like to figure it out before an official release, if possible. >>> >>>> On Jun 8, 2014, at 12:04 PM, Benjamin C. Pierce wrote: >>>> >>>> Looks like the new mac GUI is basically working. Should we start folding the changes back into the trunk repo? >>>> >>>> - Benjamin >>> >>> _______________________________________________ >>> Unison-hackers mailing list >>> Unison-hackers at lists.seas.upenn.edu >>> http://lists.seas.upenn.edu/mailman/listinfo/unison-hackers >> >> _______________________________________________ >> Unison-hackers mailing list >> Unison-hackers at lists.seas.upenn.edu >> http://lists.seas.upenn.edu/mailman/listinfo/unison-hackers > > _______________________________________________ > Unison-hackers mailing list > Unison-hackers at lists.seas.upenn.edu > http://lists.seas.upenn.edu/mailman/listinfo/unison-hackers From alan.schmitt at polytechnique.org Tue Jun 10 07:11:14 2014 From: alan.schmitt at polytechnique.org (Alan Schmitt) Date: Tue, 10 Jun 2014 13:11:14 +0200 Subject: [Unison-hackers] Mac update In-Reply-To: <25D72FC9-4B8D-4C01-BB68-08CCE032E49B@acm.org> (Alan Shutko's message of "Sun, 8 Jun 2014 20:56:44 -0500") References: <78216321-37B1-4F45-AA9B-680840BBDB14@acm.org> <60908EED-F6E2-4349-B357-46E44C34DB4C@cis.upenn.edu> <25D72FC9-4B8D-4C01-BB68-08CCE032E49B@acm.org> Message-ID: On 2014-06-09 03:56, Alan Shutko writes: > I need to spend some time looking that up. > > Worst case, I can send you a giant diff. There?s a way to do it if > I had commit access to the svn repo, but I?d prefer a way that didn?t > require that if possible. I think there might be a way for _you_ to > pull down the changes and replay them. But I need to check. (I?ve > used svn before, and I?ve used git, but I?ve never used them > together.) Regarding the initial question, I agree it's time to fold back the changes in the repository. On how to do it, it might be useful to rely on the git mirror of the svn repository. If you can create a commit against it (as a single commit), then send it using git format-patch, I can then apply it on svn through git svn. I don't know how many details you have on the git mirror, so I'll let you ask for the information you need. Best, Alan -- OpenPGP Key ID : 040D0A3B4ED2E5C7 From ats at acm.org Tue Jun 10 23:56:32 2014 From: ats at acm.org (Alan Shutko) Date: Tue, 10 Jun 2014 22:56:32 -0500 Subject: [Unison-hackers] Mac update In-Reply-To: References: <78216321-37B1-4F45-AA9B-680840BBDB14@acm.org> <60908EED-F6E2-4349-B357-46E44C34DB4C@cis.upenn.edu> <25D72FC9-4B8D-4C01-BB68-08CCE032E49B@acm.org> Message-ID: <5321033D-426D-4247-BC9B-6FE8A572F14B@acm.org> > On how to do it, it might be useful to rely on the git mirror of the svn > repository. If you can create a commit against it (as a single commit), > then send it using git format-patch, I can then apply it on svn through > git svn. > > I don't know how many details you have on the git mirror, so I'll let > you ask for the information you need. Good news. Where is the repo so that I can do a pull? I can definitely send a single commit with format-patch. From ats at acm.org Tue Jun 10 23:56:51 2014 From: ats at acm.org (Alan Shutko) Date: Tue, 10 Jun 2014 22:56:51 -0500 Subject: [Unison-hackers] Mac update In-Reply-To: <15E72EC0-8B57-449F-836F-329EA27BF768@cis.upenn.edu> References: <78216321-37B1-4F45-AA9B-680840BBDB14@acm.org> <60908EED-F6E2-4349-B357-46E44C34DB4C@cis.upenn.edu> <25D72FC9-4B8D-4C01-BB68-08CCE032E49B@acm.org> <15E72EC0-8B57-449F-836F-329EA27BF768@cis.upenn.edu> Message-ID: <76866729-5BD9-46DA-94BC-F50AAD21893C@acm.org> Only one: src/uimacbridgenew.ml > On Jun 9, 2014, at 5:46 AM, Benjamin Pierce wrote: > > I assume most of the changes you've made are to the GUI itself, which hasn't changed on this side. How many .ml files have changed? From alan.schmitt at polytechnique.org Wed Jun 11 08:06:16 2014 From: alan.schmitt at polytechnique.org (Alan Schmitt) Date: Wed, 11 Jun 2014 14:06:16 +0200 Subject: [Unison-hackers] Mac update In-Reply-To: <5321033D-426D-4247-BC9B-6FE8A572F14B@acm.org> (Alan Shutko's message of "Tue, 10 Jun 2014 22:56:32 -0500") References: <78216321-37B1-4F45-AA9B-680840BBDB14@acm.org> <60908EED-F6E2-4349-B357-46E44C34DB4C@cis.upenn.edu> <25D72FC9-4B8D-4C01-BB68-08CCE032E49B@acm.org> <5321033D-426D-4247-BC9B-6FE8A572F14B@acm.org> Message-ID: On 2014-06-11 05:56, Alan Shutko writes: >> On how to do it, it might be useful to rely on the git mirror of the svn >> repository. If you can create a commit against it (as a single commit), >> then send it using git format-patch, I can then apply it on svn through >> git svn. >> >> I don't know how many details you have on the git mirror, so I'll let >> you ask for the information you need. > > Good news. Where is the repo so that I can do a pull? It's here: https://forge.ocamlcore.org/projects/unison-mirror/ I just checked and it's up to date. > I can definitely send a single commit with format-patch. Great! Alan -- OpenPGP Key ID : 040D0A3B4ED2E5C7 From bcpierce at cis.upenn.edu Wed Jun 11 08:07:07 2014 From: bcpierce at cis.upenn.edu (Benjamin C. Pierce) Date: Wed, 11 Jun 2014 08:07:07 -0400 Subject: [Unison-hackers] Mac update In-Reply-To: <76866729-5BD9-46DA-94BC-F50AAD21893C@acm.org> References: <78216321-37B1-4F45-AA9B-680840BBDB14@acm.org> <60908EED-F6E2-4349-B357-46E44C34DB4C@cis.upenn.edu> <25D72FC9-4B8D-4C01-BB68-08CCE032E49B@acm.org> <15E72EC0-8B57-449F-836F-329EA27BF768@cis.upenn.edu> <76866729-5BD9-46DA-94BC-F50AAD21893C@acm.org> Message-ID: <41169D67-9EAB-40B7-AFEB-0A2669BD44A4@cis.upenn.edu> Then it?s easy ? you can just send me a tarball. - B On Jun 10, 2014, at 11:56 PM, Alan Shutko wrote: > Only one: src/uimacbridgenew.ml > >> On Jun 9, 2014, at 5:46 AM, Benjamin Pierce wrote: >> >> I assume most of the changes you've made are to the GUI itself, which hasn't changed on this side. How many .ml files have changed? > > _______________________________________________ > Unison-hackers mailing list > Unison-hackers at lists.seas.upenn.edu > http://lists.seas.upenn.edu/mailman/listinfo/unison-hackers From ats at acm.org Sat Jun 21 09:35:19 2014 From: ats at acm.org (Alan Shutko) Date: Sat, 21 Jun 2014 08:35:19 -0500 Subject: [Unison-hackers] Mac update In-Reply-To: <41169D67-9EAB-40B7-AFEB-0A2669BD44A4@cis.upenn.edu> References: <78216321-37B1-4F45-AA9B-680840BBDB14@acm.org> <60908EED-F6E2-4349-B357-46E44C34DB4C@cis.upenn.edu> <25D72FC9-4B8D-4C01-BB68-08CCE032E49B@acm.org> <15E72EC0-8B57-449F-836F-329EA27BF768@cis.upenn.edu> <76866729-5BD9-46DA-94BC-F50AAD21893C@acm.org> <41169D67-9EAB-40B7-AFEB-0A2669BD44A4@cis.upenn.edu> Message-ID: I sent one by direct email. Did you get it? > On Jun 11, 2014, at 7:07 AM, Benjamin C. Pierce wrote: > > Then it?s easy ? you can just send me a tarball. > > - B > > > On Jun 10, 2014, at 11:56 PM, Alan Shutko wrote: > >> Only one: src/uimacbridgenew.ml >> >>> On Jun 9, 2014, at 5:46 AM, Benjamin Pierce wrote: >>> >>> I assume most of the changes you've made are to the GUI itself, which hasn't changed on this side. How many .ml files have changed? >> >> _______________________________________________ >> Unison-hackers mailing list >> Unison-hackers at lists.seas.upenn.edu >> http://lists.seas.upenn.edu/mailman/listinfo/unison-hackers > > _______________________________________________ > Unison-hackers mailing list > Unison-hackers at lists.seas.upenn.edu > http://lists.seas.upenn.edu/mailman/listinfo/unison-hackers From bcpierce at cis.upenn.edu Wed Jun 25 16:13:30 2014 From: bcpierce at cis.upenn.edu (Benjamin C. Pierce) Date: Wed, 25 Jun 2014 16:13:30 -0400 Subject: [Unison-hackers] Mac update In-Reply-To: References: <78216321-37B1-4F45-AA9B-680840BBDB14@acm.org> <60908EED-F6E2-4349-B357-46E44C34DB4C@cis.upenn.edu> <25D72FC9-4B8D-4C01-BB68-08CCE032E49B@acm.org> <15E72EC0-8B57-449F-836F-329EA27BF768@cis.upenn.edu> <76866729-5BD9-46DA-94BC-F50AAD21893C@acm.org> <41169D67-9EAB-40B7-AFEB-0A2669BD44A4@cis.upenn.edu> Message-ID: Yes, got it! Will take a look soon... - B On Jun 21, 2014, at 9:35 AM, Alan Shutko wrote: > I sent one by direct email. Did you get it? > >> On Jun 11, 2014, at 7:07 AM, Benjamin C. Pierce wrote: >> >> Then it?s easy ? you can just send me a tarball. >> >> - B >> >> >> On Jun 10, 2014, at 11:56 PM, Alan Shutko wrote: >> >>> Only one: src/uimacbridgenew.ml >>> >>>> On Jun 9, 2014, at 5:46 AM, Benjamin Pierce wrote: >>>> >>>> I assume most of the changes you've made are to the GUI itself, which hasn't changed on this side. How many .ml files have changed? >>> >>> _______________________________________________ >>> Unison-hackers mailing list >>> Unison-hackers at lists.seas.upenn.edu >>> http://lists.seas.upenn.edu/mailman/listinfo/unison-hackers >> >> _______________________________________________ >> Unison-hackers mailing list >> Unison-hackers at lists.seas.upenn.edu >> http://lists.seas.upenn.edu/mailman/listinfo/unison-hackers > > _______________________________________________ > Unison-hackers mailing list > Unison-hackers at lists.seas.upenn.edu > http://lists.seas.upenn.edu/mailman/listinfo/unison-hackers