You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@devicemap.apache.org by Reza <re...@yahoo.com.INVALID> on 2014/07/24 19:09:16 UTC
Re: svn
What are you trying to do (or cant do) on SVN? We can assist you... Its probably important that you know how to navigate svn :)
________________________________
From: eberhard speer jr. <se...@ducis.net>
To: devicemap-dev@incubator.apache.org
Sent: Thursday, July 24, 2014 1:04 PM
Subject: Re: [VOTE] Apache DeviceMap .Net clients 1.0.0 release
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi,
I thought I had explained the internal version numbering and their
relation to Strong Naming and signed assemblies.
SVN, I would ask Bertrand to do his magic again as he did the tag
thing for me.
esjr
On 24/07/2014 17:07, Kevan Miller wrote:
> Checksum looks ok. I can't verify the signature, at the moment. I
> assume others have verified.
>
> I don't have an environment to build/test.
>
> I note the svn tags do not include LICENSE/NOTICE/DISCLAIMER. They
> should.
>
> I also noted the following differences between release archive and
> the release tag in svn:
>
> $ diff -r DeviceMap/
> ../svn/devicemap/tags/releases/devicemap-vbnet-incubating-1.0.0/vbnet/
>
>
diff -r DeviceMap/DeviceMap/My Project/AssemblyInfo.vb
> ../svn/devicemap/tags/releases/devicemap-vbnet-incubating-1.0.0/vbnet/DeviceMap/My
>
>
Project/AssemblyInfo.vb
> 33,34c33,34 < <Assembly: AssemblyVersion("1.7.7.3")> < <Assembly:
> AssemblyFileVersion("1.7.7.3")> ---
>> <Assembly: AssemblyVersion("1.7.7.4")> <Assembly:
>> AssemblyFileVersion("1.7.7.4")>
> diff -r DeviceMap/DeviceMapConsole/My Project/AssemblyInfo.vb
> ../svn/devicemap/tags/releases/devicemap-vbnet-incubating-1.0.0/vbnet/DeviceMapConsole/My
>
>
Project/AssemblyInfo.vb
> 34,35c34,35 < <Assembly: AssemblyVersion("1.7.7.2")> < <Assembly:
> AssemblyFileVersion("1.7.7.2")> ---
>> <Assembly: AssemblyVersion("1.7.7.3")> <Assembly:
>> AssemblyFileVersion("1.7.7.3")>
> $ cd ../csharp/ $ diff -r DeviceMap/
> ../svn/devicemap/tags/releases/devicemap-csharp-incubating-1.0.0/csharp/
>
>
Only in
> ../svn/devicemap/tags/releases/devicemap-csharp-incubating-1.0.0/csharp/:
>
>
ReadMe
>
> I'd recommend that they be the same. One note -- the release
> archives are the release, not the svn tag. But there is some
> expectation that they are equivalent.
>
> --kevan
>
>
> On Wed, Jul 23, 2014 at 3:34 AM, eberhard speer jr.
> <se...@ducis.net> wrote:
>
> so updated that too....extension less files...
>
> esjr
>
>
> On 23/07/2014 09:47, Bertrand Delacretaz wrote:
>>>> On Wed, Jul 23, 2014 at 12:19 AM, eberhard speer jr.
>>>> <se...@ducis.net> wrote:
>>>>> ...disclaimer, notice and license added to zip...
>>>>
>>>> Those have to be named DISCLAIMER, LICENSE and NOTICE,
>>>> variations are not ok unfortunately.
>>>>
>>>> $ unzip -l devicemap-csharp-incubating-1.0.0.zip ... 527
>>>> 07-22-14 21:29 disclaimer.txt 10404 07-22-14 21:31
>>>> License.txt 168 07-22-14 21:38 Notice.txt
>>>>
>>>> -Bertrand
>>>>
>
>>
>
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (MingW32)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/
iQEcBAEBAgAGBQJT0TyUAAoJEOxywXcFLKYcxTkH/if0Pxsww5DkJQrDKTo+75x4
2SIdKg3aYAN14rIy64uNYX0ewS9pjMjvgA3TLKfl+FdG/Fdj+LHbHFhTjpwY7A1S
fW6wWjBpLiE6GGDtqLnRLCBxIi6/bXeZbNu7NAkq/uB1jjdUiU5V+xV/aKzVdTT8
QDxG3Zt5vXapMX3vCUTzI0iTWbIKJI7EoovQo4eiaY8FccnM1mXgTmMCJd/IGKyu
m2A8rFamXkQn+mWaACSQNDoJDaHnsJ7QwBcUy9SYSIhs196yL7sWyI1r4t0meewK
XeaYCUXKZ6trFmViGAD9hiadL5RHcUb6XEwMN2jTUID0Bv/ohiaBoIPTOR+poEk=
=ltbY
-----END PGP SIGNATURE-----
Re: svn
Posted by Reza <re...@yahoo.com.INVALID>.
So a quick SVN rundown.
First, http://tortoisesvn.net/ is a great windows svn client. I use that, the IDE client, and cmd line.
Main development is done in trunk, you seem to be committing to trunk without problem.
When you are ready for a release, you make a tag. A tag is like a snapshot of your code. SVN does not enforce this other than by convention: there is a tag folder. So there are 2 ways to tag, you can use the branch/tag svn command which will copy your HEAD or a commit to another location (svn copy). Or you can manually copy the code into the tags folder. Not recommended, but not the end of the world if you do it this way since it might be easier.
Here are the current tags:
http://svn.apache.org/viewvc/incubator/devicemap/tags/releases/
So you can either go back and fix the tag or make a new tag. Its not recommended to change tags since you violate the convention of it being a snapshot of code. Bad practice, but acceptable in certain circumstances.
Finally, branches. Lets say you need to patch code from a tag, ie: maintenance release or supporting 2 versions. Just repeat the tag process (svn copy), except move it to branch folder. Do your dev in the branch and when its ready, snapshot it back to a tag for the release. You can also merge code from branch into trunk or merge code from trunk into branch. Whatever makes sense in your branch dev context.
Branches can also be used for experimental development or any other kind of development which you dont want to take place in the main trunk.
So.... make sense? So the ask from Kevan is to make sure your release tag matches whats in your tarball. So you can either make a new tag or go in and fix it manually.
________________________________
From: Reza <re...@yahoo.com.INVALID>
To: "devicemap-dev@incubator.apache.org" <de...@incubator.apache.org>
Sent: Thursday, July 24, 2014 1:09 PM
Subject: Re: svn
What are you trying to do (or cant do) on SVN? We can assist you... Its probably important that you know how to navigate svn :)
________________________________
From: eberhard speer jr. <se...@ducis.net>
To: devicemap-dev@incubator.apache.org
Sent: Thursday, July 24, 2014 1:04 PM
Subject: Re: [VOTE] Apache DeviceMap .Net clients 1.0.0 release
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi,
I thought I had explained the internal version numbering and their
relation to Strong Naming and signed assemblies.
SVN, I would ask Bertrand to do his magic again as he did the tag
thing for me.
esjr
On 24/07/2014 17:07, Kevan Miller wrote:
> Checksum looks ok. I can't verify the signature, at the moment. I
> assume others have verified.
>
> I don't have an environment to build/test.
>
> I note the svn tags do not include LICENSE/NOTICE/DISCLAIMER. They
> should.
>
> I also noted the following differences between release archive and
> the release tag in svn:
>
> $ diff -r DeviceMap/
> ../svn/devicemap/tags/releases/devicemap-vbnet-incubating-1.0.0/vbnet/
>
>
diff -r DeviceMap/DeviceMap/My Project/AssemblyInfo.vb
> ../svn/devicemap/tags/releases/devicemap-vbnet-incubating-1.0.0/vbnet/DeviceMap/My
>
>
Project/AssemblyInfo.vb
> 33,34c33,34 < <Assembly: AssemblyVersion("1.7.7.3")> < <Assembly:
> AssemblyFileVersion("1.7.7.3")> ---
>> <Assembly: AssemblyVersion("1.7.7.4")> <Assembly:
>> AssemblyFileVersion("1.7.7.4")>
> diff -r DeviceMap/DeviceMapConsole/My Project/AssemblyInfo.vb
> ../svn/devicemap/tags/releases/devicemap-vbnet-incubating-1.0.0/vbnet/DeviceMapConsole/My
>
>
Project/AssemblyInfo.vb
> 34,35c34,35 < <Assembly: AssemblyVersion("1.7.7.2")> < <Assembly:
> AssemblyFileVersion("1.7.7.2")> ---
>> <Assembly: AssemblyVersion("1.7.7.3")> <Assembly:
>> AssemblyFileVersion("1.7.7.3")>
> $ cd ../csharp/ $ diff -r DeviceMap/
> ../svn/devicemap/tags/releases/devicemap-csharp-incubating-1.0.0/csharp/
>
>
Only in
> ../svn/devicemap/tags/releases/devicemap-csharp-incubating-1.0.0/csharp/:
>
>
ReadMe
>
> I'd recommend that they be the same. One note -- the release
> archives are the release, not the svn tag. But there is some
> expectation that they are equivalent.
>
> --kevan
>
>
> On Wed, Jul 23, 2014 at 3:34 AM, eberhard speer jr.
> <se...@ducis.net> wrote:
>
> so updated that too....extension less files...
>
> esjr
>
>
> On 23/07/2014 09:47, Bertrand Delacretaz wrote:
>>>> On Wed, Jul 23, 2014 at 12:19 AM, eberhard speer jr.
>>>> <se...@ducis.net> wrote:
>>>>> ...disclaimer, notice and license added to zip...
>>>>
>>>> Those have to be named DISCLAIMER, LICENSE and NOTICE,
>>>> variations are not ok unfortunately.
>>>>
>>>> $ unzip -l devicemap-csharp-incubating-1.0.0.zip ... 527
>>>> 07-22-14 21:29 disclaimer.txt 10404 07-22-14 21:31
>>>> License.txt 168 07-22-14 21:38 Notice.txt
>>>>
>>>> -Bertrand
>>>>
>
>>
>
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (MingW32)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/
iQEcBAEBAgAGBQJT0TyUAAoJEOxywXcFLKYcxTkH/if0Pxsww5DkJQrDKTo+75x4
2SIdKg3aYAN14rIy64uNYX0ewS9pjMjvgA3TLKfl+FdG/Fdj+LHbHFhTjpwY7A1S
fW6wWjBpLiE6GGDtqLnRLCBxIi6/bXeZbNu7NAkq/uB1jjdUiU5V+xV/aKzVdTT8
QDxG3Zt5vXapMX3vCUTzI0iTWbIKJI7EoovQo4eiaY8FccnM1mXgTmMCJd/IGKyu
m2A8rFamXkQn+mWaACSQNDoJDaHnsJ7QwBcUy9SYSIhs196yL7sWyI1r4t0meewK
XeaYCUXKZ6trFmViGAD9hiadL5RHcUb6XEwMN2jTUID0Bv/ohiaBoIPTOR+poEk=
=ltbY
-----END PGP SIGNATURE-----