From: Peter L. <pal...@gm...> - 2011-09-23 20:50:15
|
Thanks guys. I didn;t think it would be that easy, mainly I though I would not have permission to create branches. It will also be easy to copy the changes I;ve made locally into the new branch as Scott has suggested. On 24 September 2011 04:05, Mark Wrightson <ma...@rw...> wrote: > Hi Peter, > > Scott was about right in his instructions. To make it one step easier, I > have created the branch for the timezone work. > Please check out > https://tsheetx.svn.sourceforge.net/svnroot/tsheetx/branches/txsheet-2.0-timezone > > :) > > Mark > > _____________________________________________ > > Mob: 07725 695178 > Email: ma...@rw... > > > On 23/09/2011 15:22, Scott Miller wrote: > > >From memory, to correctly create a new branch, you first create a copy of > what your working on *within the repository*, something like: > svn copy http://source-directory http://destination-directory > > Then check the new branch out. Make changes, and check in; changes will > get saved on the destination branch. > > If you just copy it on your local machine as you've done so far, if you > 'accidentally' ever check that in, it will be checked into the original > source directory in the repository - not what you want. To "fix" the > situation you have, do the repository copy, check things out to a new > directory on your local box, and then copy the changed files from your new > working directory into the newly checked out directory. Then make your new > working directory the newly checked out directory, and delete the 'local > copy' directory to keep accidents from happening. > > -Scott > > On Thu, Sep 22, 2011 at 11:51 PM, Peter Lazarus <pal...@gm...>wrote: > >> Dave, >> I think it would be useful to create a new branch for timezone >> experiments. Then the experiments we do can be shared and criticised and >> improved. >> >> I copied the latest branch txsheet-2.0-demo on my machine to a new >> directory to do some experimenting. So far I can define a timezone for >> each person, and in one report, display the stored timezone for each >> time record. There are quite a number of mods to be made to the clock >> popup to enable timezone entry to carry this further and allow data >> entry. But it's not too difficult a change to make. >> >> The changes so far bring up another issue. If a user does work in New >> York, his home base, and then flies to LA for two weeks, he would need >> some temporary timezone change, or the ability to select an alternative >> timezone at clockon/off time. >> >> Now I'm not exactly clear on how svn branches work, so that might be the >> wrong terminology. But if the timezone stuff can use txsheet-2.0-demo as >> a base, with a later probability that the changes could be merged back >> into txsheet-2.0-demo is what I seek. >> >> Thanks >> Peter >> >> >> ------------------------------------------------------------------------------ >> All of the data generated in your IT infrastructure is seriously valuable. >> Why? It contains a definitive record of application performance, security >> threats, fraudulent activity, and more. Splunk takes this data and makes >> sense of it. IT sense. And common sense. >> http://p.sf.net/sfu/splunk-d2dcopy2 >> _______________________________________________ >> Tsheetx-developers mailing list >> Tsh...@li... >> https://lists.sourceforge.net/lists/listinfo/tsheetx-developers >> > > > > ------------------------------------------------------------------------------ > All of the data generated in your IT infrastructure is seriously valuable. > Why? It contains a definitive record of application performance, security > threats, fraudulent activity, and more. Splunk takes this data and makes > sense of it. IT sense. And common sense.http://p.sf.net/sfu/splunk-d2dcopy2 > > > > _______________________________________________ > Tsheetx-developers mailing lis...@li...https://lists.sourceforge.net/lists/listinfo/tsheetx-developers > > > > ------------------------------------------------------------------------------ > All of the data generated in your IT infrastructure is seriously valuable. > Why? It contains a definitive record of application performance, security > threats, fraudulent activity, and more. Splunk takes this data and makes > sense of it. IT sense. And common sense. > http://p.sf.net/sfu/splunk-d2dcopy2 > _______________________________________________ > Tsheetx-developers mailing list > Tsh...@li... > https://lists.sourceforge.net/lists/listinfo/tsheetx-developers > > |