[lm-sensors] Branches in lm-sensors repository

[lm-sensors] Branches in lm-sensors repository

[Jean Delvare]

Hi all,

I think it is a bit confusing that all the development of lm-sensors is
happening in branch lm-sensors-3.0.0, and trunk is in maintenance mode.
It would make sense to use trunk for development again, and move the
2.10.x maintenance to a branch. What is even more confusing is that
what we are developing in branch lm-sensors-3.0.0 is no longer
lm-sensors 3.0.0, but 3.0.4, and as time passes the difference between
the name and the actual version will become larger.

Moving 2.10.x to a branch shouldn't be difficult: a svn copy or svn
move should do if I understand how SVN works. The only thing to decide
is the name of the new branch. At first I had "legacy" in mind but it
might not be the best for long term, as chances are that our active
3.0.0 branch will someday become the new legacy branch. So, what about
"lm-sensors-2.10"?

Moving development back to trunk might be a little more difficult, if
SVN considers trunk as special. If not, then maybe a svn move will
work. I am no SVN expert, so if anyone knows more about this type of
operation and has suggestions, these are very welcome.

I will proceed next week. One reason why I want this done quickly is
that I am currently updating our documentation in the wiki and I don't
want to have to update all the links when we rename the branches. So
better do the rename now and I'll continue the documentation updates
after that.

Thanks,
-- 
Jean Delvare

_______________________________________________
lm-sensors mailing list
lm-sensors@lm-sensors.org
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors

Re: [lm-sensors] Branches in lm-sensors repository

[Jean Delvare]

On Mon, 19 Jan 2009 22:26:36 +0100, Jean Delvare wrote:
> Hi all,
> 
> I think it is a bit confusing that all the development of lm-sensors is
> happening in branch lm-sensors-3.0.0, and trunk is in maintenance mode.
> It would make sense to use trunk for development again, and move the
> 2.10.x maintenance to a branch. What is even more confusing is that
> what we are developing in branch lm-sensors-3.0.0 is no longer
> lm-sensors 3.0.0, but 3.0.4, and as time passes the difference between
> the name and the actual version will become larger.
> 
> Moving 2.10.x to a branch shouldn't be difficult: a svn copy or svn
> move should do if I understand how SVN works. The only thing to decide
> is the name of the new branch. At first I had "legacy" in mind but it
> might not be the best for long term, as chances are that our active
> 3.0.0 branch will someday become the new legacy branch. So, what about
> "lm-sensors-2.10"?
> 
> Moving development back to trunk might be a little more difficult, if
> SVN considers trunk as special. If not, then maybe a svn move will
> work. I am no SVN expert, so if anyone knows more about this type of
> operation and has suggestions, these are very welcome.
> 
> I will proceed next week. One reason why I want this done quickly is
> that I am currently updating our documentation in the wiki and I don't
> want to have to update all the links when we rename the branches. So
> better do the rename now and I'll continue the documentation updates
> after that.

This is done now. As I hopped, this was a simple matter of two "svn
move" commands. Kudos to the Subversion developers for making it so
easy.

Developers with local repository checkouts will want to use "svn
switch" command to switch to the new branches. For the legacy branch,
do:

svn switch http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-2.10

For the development branch, do:

svn switch http://lm-sensors.org/svn/lm-sensors/trunk

Make sure you have no local changes first, as I have no idea what would
happen to them.

-- 
Jean Delvare

_______________________________________________
lm-sensors mailing list
lm-sensors@lm-sensors.org
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors

Re: [lm-sensors] Branches in lm-sensors repository

[Jean Delvare]

Hi Axel,

On Mon, 26 Jan 2009 16:51:19 +0100, Jean Delvare wrote:
> This is done now. As I hopped, this was a simple matter of two "svn
> move" commands. Kudos to the Subversion developers for making it so
> easy.

Oh, BTW, I expect this change to break nightly SVN snapshots.

I suppose that we no longer really care about snapshots of the legacy
(lm-sensors 2.10) branch.

The snapshot command for trunk was operating on the legacy code before
and is now operating on the development tree. Alright, that's exactly
what we want.

The snapshot command for the lm-sensors-3.0.0 branch will fail. So all
you have to do is remove this part from the snapshot script.

Thanks,
-- 
Jean Delvare

_______________________________________________
lm-sensors mailing list
lm-sensors@lm-sensors.org
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors

Re: [lm-sensors] Branches in lm-sensors repository

[Axel Thimm]

[-- Attachment #1.1: Type: text/plain, Size: 1070 bytes --]

Hi,

On Mon, Jan 26, 2009 at 05:58:37PM +0100, Jean Delvare wrote:
> On Mon, 26 Jan 2009 16:51:19 +0100, Jean Delvare wrote:
> > This is done now. As I hopped, this was a simple matter of two "svn
> > move" commands. Kudos to the Subversion developers for making it so
> > easy.
> 
> Oh, BTW, I expect this change to break nightly SVN snapshots.
> 
> I suppose that we no longer really care about snapshots of the legacy
> (lm-sensors 2.10) branch.

OK, turning off.

> The snapshot command for trunk was operating on the legacy code before
> and is now operating on the development tree. Alright, that's exactly
> what we want.
> 
> The snapshot command for the lm-sensors-3.0.0 branch will fail. So all
> you have to do is remove this part from the snapshot script.

OK.

It leaves the question of where the snapshots go to now. Previously
the 3.x snapshots went under /lm-sensors-3/snapshots/, I guess they
would now better show up under /lm-sensors/snapshots/?

Should we remove /lm-sensors-3/ altogether?
-- 
Axel.Thimm at ATrpms.net

[-- Attachment #1.2: Type: application/pgp-signature, Size: 197 bytes --]

[-- Attachment #2: Type: text/plain, Size: 153 bytes --]

_______________________________________________
lm-sensors mailing list
lm-sensors@lm-sensors.org
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors

Re: [lm-sensors] Branches in lm-sensors repository

[Jean Delvare]

Hi Axel,

Thanks for the quick reply.

On Mon, 26 Jan 2009 19:27:09 +0200, Axel Thimm wrote:
> Hi,
> 
> On Mon, Jan 26, 2009 at 05:58:37PM +0100, Jean Delvare wrote:
> > On Mon, 26 Jan 2009 16:51:19 +0100, Jean Delvare wrote:
> > > This is done now. As I hopped, this was a simple matter of two "svn
> > > move" commands. Kudos to the Subversion developers for making it so
> > > easy.
> > 
> > Oh, BTW, I expect this change to break nightly SVN snapshots.
> > 
> > I suppose that we no longer really care about snapshots of the legacy
> > (lm-sensors 2.10) branch.
> 
> OK, turning off.
> 
> > The snapshot command for trunk was operating on the legacy code before
> > and is now operating on the development tree. Alright, that's exactly
> > what we want.
> > 
> > The snapshot command for the lm-sensors-3.0.0 branch will fail. So all
> > you have to do is remove this part from the snapshot script.
> 
> OK.
> 
> It leaves the question of where the snapshots go to now. Previously
> the 3.x snapshots went under /lm-sensors-3/snapshots/, I guess they
> would now better show up under /lm-sensors/snapshots/?

Yes. But I don't think you need to do anything special for this:
snapshots of trunk already went into /lm-sensors/snapshots/, and the
development branch is now trunk again. So the old command should
already do the right thing.

> Should we remove /lm-sensors-3/ altogether?

Yes, please.

-- 
Jean Delvare

_______________________________________________
lm-sensors mailing list
lm-sensors@lm-sensors.org
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors

Re: [lm-sensors] Branches in lm-sensors repository

[Axel Thimm]

[-- Attachment #1.1: Type: text/plain, Size: 877 bytes --]

Hi,

On Mon, Jan 26, 2009 at 06:36:46PM +0100, Jean Delvare wrote:
> > It leaves the question of where the snapshots go to now. Previously
> > the 3.x snapshots went under /lm-sensors-3/snapshots/, I guess they
> > would now better show up under /lm-sensors/snapshots/?
> 
> Yes. But I don't think you need to do anything special for this:
> snapshots of trunk already went into /lm-sensors/snapshots/, and the
> development branch is now trunk again. So the old command should
> already do the right thing.

True, so it just needed removing the cron job for lm-sensors-3. Well
planned when you set this up ;)

> > Should we remove /lm-sensors-3/ altogether?
> 
> Yes, please.

OK, done. Should all work as you said, but maybe we should check the
contents of the next snapshot tomorrow (runs at 6:10 CET) just to make
sure.
-- 
Axel.Thimm at ATrpms.net

[-- Attachment #1.2: Type: application/pgp-signature, Size: 197 bytes --]

[-- Attachment #2: Type: text/plain, Size: 153 bytes --]

_______________________________________________
lm-sensors mailing list
lm-sensors@lm-sensors.org
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors

Re: [lm-sensors] Branches in lm-sensors repository

[Jean Delvare]

On Mon, 26 Jan 2009 19:48:23 +0200, Axel Thimm wrote:
> Hi,
> 
> On Mon, Jan 26, 2009 at 06:36:46PM +0100, Jean Delvare wrote:
> > > It leaves the question of where the snapshots go to now. Previously
> > > the 3.x snapshots went under /lm-sensors-3/snapshots/, I guess they
> > > would now better show up under /lm-sensors/snapshots/?
> > 
> > Yes. But I don't think you need to do anything special for this:
> > snapshots of trunk already went into /lm-sensors/snapshots/, and the
> > development branch is now trunk again. So the old command should
> > already do the right thing.
> 
> True, so it just needed removing the cron job for lm-sensors-3. Well
> planned when you set this up ;)
> 
> > > Should we remove /lm-sensors-3/ altogether?
> > 
> > Yes, please.
> 
> OK, done. Should all work as you said, but maybe we should check the
> contents of the next snapshot tomorrow (runs at 6:10 CET) just to make
> sure.

Looks OK to me. Thanks!

-- 
Jean Delvare

_______________________________________________
lm-sensors mailing list
lm-sensors@lm-sensors.org
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors