Menu
▾
▴
Re: [Tsheetx-developers] New branch required for timezone experiments?
|
From: Mark W. <ma...@rw...> - 2011-09-23 18:05:24
|
<html>
<head>
<meta content="text/html; charset=ISO-8859-1"
http-equiv="Content-Type">
</head>
<body bgcolor="#FFFFFF" text="#000000">
Hi Peter, <br>
<br>
Scott was about right in his instructions. To make it one step
easier, I have created the branch for the timezone work.<br>
Please check out <a
href="https://tsheetx.svn.sourceforge.net/svnroot/tsheetx/branches/txsheet-2.0-timezone">https://tsheetx.svn.sourceforge.net/svnroot/tsheetx/branches/txsheet-2.0-timezone</a><br>
<br>
:)<br>
<br>
Mark<br>
<pre class="moz-signature" cols="72">_____________________________________________
Mob: 07725 695178
Email: <a class="moz-txt-link-abbreviated" href="mailto:ma...@rw...">ma...@rw...</a></pre>
<br>
On 23/09/2011 15:22, Scott Miller wrote:
<blockquote
cite="mid:CAL...@ma..."
type="cite">>From memory, to correctly create a new branch, you
first create a copy of what your working on <b>within the
repository</b>, something like:
<div> svn copy <a moz-do-not-send="true"
href="http://source-directory">http://source-directory</a> <a
moz-do-not-send="true" href="http://destination-directory">http://destination-directory</a></div>
<div><br>
</div>
<div>Then check the new branch out. Make changes, and check in;
changes will get saved on the destination branch.</div>
<div><br>
</div>
<div>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.</div>
<div><br>
</div>
<div>-Scott</div>
<div><br>
<div class="gmail_quote">On Thu, Sep 22, 2011 at 11:51 PM, Peter
Lazarus <span dir="ltr"><<a moz-do-not-send="true"
href="mailto:pal...@gm...">pal...@gm...</a>></span>
wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0
.8ex;border-left:1px #ccc solid;padding-left:1ex;">
Dave,<br>
I think it would be useful to create a new branch for
timezone<br>
experiments. Then the experiments we do can be shared and
criticised and<br>
improved.<br>
<br>
I copied the latest branch txsheet-2.0-demo on my machine to
a new<br>
directory to do some experimenting. So far I can define a
timezone for<br>
each person, and in one report, display the stored timezone
for each<br>
time record. There are quite a number of mods to be made to
the clock<br>
popup to enable timezone entry to carry this further and
allow data<br>
entry. But it's not too difficult a change to make.<br>
<br>
The changes so far bring up another issue. If a user does
work in New<br>
York, his home base, and then flies to LA for two weeks, he
would need<br>
some temporary timezone change, or the ability to select an
alternative<br>
timezone at clockon/off time.<br>
<br>
Now I'm not exactly clear on how svn branches work, so that
might be the<br>
wrong terminology. But if the timezone stuff can use
txsheet-2.0-demo as<br>
a base, with a later probability that the changes could be
merged back<br>
into txsheet-2.0-demo is what I seek.<br>
<br>
Thanks<br>
Peter<br>
<br>
------------------------------------------------------------------------------<br>
All of the data generated in your IT infrastructure is
seriously valuable.<br>
Why? It contains a definitive record of application
performance, security<br>
threats, fraudulent activity, and more. Splunk takes this
data and makes<br>
sense of it. IT sense. And common sense.<br>
<a moz-do-not-send="true"
href="http://p.sf.net/sfu/splunk-d2dcopy2" target="_blank">http://p.sf.net/sfu/splunk-d2dcopy2</a><br>
_______________________________________________<br>
Tsheetx-developers mailing list<br>
<a moz-do-not-send="true"
href="mailto:Tsh...@li...">Tsh...@li...</a><br>
<a moz-do-not-send="true"
href="https://lists.sourceforge.net/lists/listinfo/tsheetx-developers"
target="_blank">https://lists.sourceforge.net/lists/listinfo/tsheetx-developers</a><br>
</blockquote>
</div>
<br>
</div>
<br>
<fieldset class="mimeAttachmentHeader"></fieldset>
<br>
<pre wrap="">------------------------------------------------------------------------------
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.
<a class="moz-txt-link-freetext" href="http://p.sf.net/sfu/splunk-d2dcopy2">http://p.sf.net/sfu/splunk-d2dcopy2</a></pre>
<br>
<fieldset class="mimeAttachmentHeader"></fieldset>
<br>
<pre wrap="">_______________________________________________
Tsheetx-developers mailing list
<a class="moz-txt-link-abbreviated" href="mailto:Tsh...@li...">Tsh...@li...</a>
<a class="moz-txt-link-freetext" href="https://lists.sourceforge.net/lists/listinfo/tsheetx-developers">https://lists.sourceforge.net/lists/listinfo/tsheetx-developers</a>
</pre>
</blockquote>
</body>
</html>
|
