we are using git, simply create a "lightroom" branch on a commit where the lightroom stuff is, then remove completely the lightroom stuff (lightroom.c, the button, the entry in cmake)
this way master will be completely clean, and the lightroom branch will have all the changes for lightroom. merging will be trivial and everybody will be happy #if 0 to keep code we don't use only makes sense when you don't have a configuration management system. when you have git, you just delete code... and, pascal... if you could simply name your branch "lightroom" instead of "po/lr" that would be nice... the po keyword is usually something we use for translation stuff... and yes, here no reply simply needs you need to ping us some more... our community is not very fast to answer to that sort of requests and a week or two without answer is pretty common despite our best efforts... sorry for the confusion... As for the integration into import, the more I think of it the more I like it UI-wise. answer to your remark wrt point 3 : yes, when you reset an image you loose both your own processing and the automated DT default developement (being normal DT or your LR import). However I don't think that's an issue. Once the parameters have been applied once It's not possible to tell what parameters come from the import and what parameters have been hand tweaked and a "reimport with the new DT defaults but keep my tweaks" sounds too complicated and dangerous. The general philosophy would be "once you start tweaking an image, DT doesn't change it for you" the action of "delete all developement and reimport" is an active action of the user with a strong "yes I know that I'm loosing everything, but do it anyway" undertone. so I thing it works I have one question (more to jo than to you) with the import approch, though... The LR import creates tags for the image and I'm not sure how that would be dealt with... we want tags to be added to the image at import time, not at first load time... so we need to read the xmp somehow at load time. For normal image, DT does add a couple of tags (like the one marking the image as a RAW image) but I don't know how it's done. You could probably plug into that code, though.... i'd like some comments by jo on that one Cheers Boucman On Wed, Jan 23, 2013 at 8:58 AM, James C. McPherson <[email protected]> wrote: > On 23/01/13 05:56 PM, Pascal Obry wrote: >> Le 23/01/2013 08:54, James C. McPherson a écrit : >>> Please, don't do that. Using "#if 0" indicates laziness - >>> if the code should not be compiled, then it should not be >>> in the file. >> >> I was only proposing to do that in the branch not on master. > > It doesn't matter where you propose to do it, it's still > the wrong thing to do. > > > James C. McPherson > -- > Solaris kernel software engineer, system admin and troubleshooter > http://www.jmcpdotcom.com/blog > Find me on LinkedIn @ http://www.linkedin.com/in/jamescmcpherson > > > ------------------------------------------------------------------------------ > Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS, > MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current > with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft > MVPs and experts. ON SALE this month only -- learn more at: > http://p.sf.net/sfu/learnnow-d2d > _______________________________________________ > darktable-devel mailing list > [email protected] > https://lists.sourceforge.net/lists/listinfo/darktable-devel ------------------------------------------------------------------------------ Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS, MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft MVPs and experts. ON SALE this month only -- learn more at: http://p.sf.net/sfu/learnnow-d2d _______________________________________________ darktable-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/darktable-devel
