Re: Big mess in 2.0

2013-12-04 Thread sebb
On 29 November 2013 03:03, Emmanuel Lécharny elecha...@gmail.com wrote: Le 11/28/13 10:27 PM, sebb a écrit : If it should become necessary to mark a branch read-only, I would suggest the following: Rename it as a tag; that's effectively what it has become - tags should be immutable.

Re: Big mess in 2.0

2013-12-04 Thread Emmanuel Lécharny
Le 12/4/13 5:41 PM, sebb a écrit : On 29 November 2013 03:03, Emmanuel Lécharny elecha...@gmail.com wrote: Le 11/28/13 10:27 PM, sebb a écrit : If it should become necessary to mark a branch read-only, I would suggest the following: Rename it as a tag; that's effectively what it has become -

Re: Big mess in 2.0

2013-11-29 Thread Emmanuel Lécharny
Le 11/29/13 7:34 AM, Jeff MAURY a écrit : A sub-folder has no meaning because this is just a git branch is just a virtual concept on top of sources. The problem was because of the double existence of 2.0 and 2.0.8 branches. Too much time with SVN ! Anyway, 2.0.8 is now dead, so... I don't

Re: Big mess in 2.0

2013-11-29 Thread Jeff MAURY
+1 All we need now i to make sure commits won't be done anymore on 2.0.8. Now that it's dead, we get it !!! Jeff On Fri, Nov 29, 2013 at 10:07 AM, Emmanuel Lécharny elecha...@gmail.comwrote: Le 11/29/13 7:34 AM, Jeff MAURY a écrit : A sub-folder has no meaning because this is just a git

Re: Big mess in 2.0

2013-11-28 Thread sebb
If it should become necessary to mark a branch read-only, I would suggest the following: Rename it as a tag; that's effectively what it has become - tags should be immutable. or Rename it to xxx_READ_ONLY In each case it would probably be worthwhile to add a README file to explain the rationale

Re: Big mess in 2.0

2013-11-28 Thread Jeff MAURY
Well branch has been delete (which I don't like). Can you rename a branch to be a tag with git ? Jeff On Thu, Nov 28, 2013 at 10:27 PM, sebb seb...@gmail.com wrote: If it should become necessary to mark a branch read-only, I would suggest the following: Rename it as a tag; that's

Re: Big mess in 2.0

2013-11-28 Thread Julien Vermillard
I suppose you just tag the same commit hash and drop the branch. Le 28 nov. 2013 23:14, Jeff MAURY jeffma...@jeffmaury.com a écrit : Well branch has been delete (which I don't like). Can you rename a branch to be a tag with git ? Jeff On Thu, Nov 28, 2013 at 10:27 PM, sebb seb...@gmail.com

Re: Big mess in 2.0

2013-11-28 Thread Jeff MAURY
I have not more the 2.0.8 branch on my workstation so if you have it, can you do it. Jeff On Fri, Nov 29, 2013 at 12:48 AM, Julien Vermillard jvermill...@gmail.comwrote: I suppose you just tag the same commit hash and drop the branch. Le 28 nov. 2013 23:14, Jeff MAURY jeffma...@jeffmaury.com

Re: Big mess in 2.0

2013-11-28 Thread Emmanuel Lécharny
Le 11/28/13 10:27 PM, sebb a écrit : If it should become necessary to mark a branch read-only, I would suggest the following: Rename it as a tag; that's effectively what it has become - tags should be immutable. Certainly not a tag. A tag is a released version. I'd rather move the branch to

Re: Big mess in 2.0

2013-11-28 Thread Jeff MAURY
A sub-folder has no meaning because this is just a git branch is just a virtual concept on top of sources. The problem was because of the double existence of 2.0 and 2.0.8 branches. Jeff On Fri, Nov 29, 2013 at 4:03 AM, Emmanuel Lécharny elecha...@gmail.comwrote: Le 11/28/13 10:27 PM, sebb a

Re: Big mess in 2.0

2013-11-27 Thread Jeff MAURY
Hello, I've rebased 2.0.8 into 2.0 and pushed it to the server. Still have to either delete 2.0.8 branch or put it read only (it is possible to do it with a hook but it seems it is not possible to push a hook) Jeff On Tue, Nov 26, 2013 at 11:25 PM, Emmanuel Lécharny elecha...@gmail.comwrote:

Re: Big mess in 2.0

2013-11-27 Thread Emmanuel Lécharny
Le 11/27/13 1:29 PM, Jeff MAURY a écrit : Hello, I've rebased 2.0.8 into 2.0 and pushed it to the server. Ok, thanks. Still have to either delete 2.0.8 branch or put it read only (it is possible to do it with a hook but it seems it is not possible to push a hook) Just delete it. It's

Re: Big mess in 2.0

2013-11-27 Thread Jeff MAURY
Done Jeff On Wed, Nov 27, 2013 at 1:44 PM, Emmanuel Lécharny elecha...@gmail.comwrote: Le 11/27/13 1:29 PM, Jeff MAURY a écrit : Hello, I've rebased 2.0.8 into 2.0 and pushed it to the server. Ok, thanks. Still have to either delete 2.0.8 branch or put it read only (it is

Big mess in 2.0

2013-11-26 Thread Jeff MAURY
Hello, I'm restoring my Mina development environment after my disk crash. I noticed we now have two branches for 2.0, the 2.0 and 2.0.8. It seems most of the updates has been done in 2.0. So I think we shoud clean up this situation. I will propose: - merge 2.0.8 into 2.0 - put 2.0.8 in

Re: Big mess in 2.0

2013-11-26 Thread Emmanuel Lécharny
Le 11/26/13 10:40 PM, Jeff MAURY a écrit : Hello, I'm restoring my Mina development environment after my disk crash. I noticed we now have two branches for 2.0, the 2.0 and 2.0.8. It seems most of the updates has been done in 2.0. So I think we shoud clean up this situation. I will propose:

Re: Big mess in 2.0

2013-11-26 Thread Jeff MAURY
I want to keep it because I don't like deleting stuff on the server that may be pushed somewhere else. That's why I prefer to keep it but in read only to make sure the current situation won't happen anymore. But if we cannot have a read only mode, then delete it. Jeff On Tue, Nov 26, 2013 at

Re: Big mess in 2.0

2013-11-26 Thread Emmanuel Lécharny
Le 11/26/13 11:08 PM, Jeff MAURY a écrit : I want to keep it because I don't like deleting stuff on the server that may be pushed somewhere else. That's why I prefer to keep it but in read only to make sure the current situation won't happen anymore. But if we cannot have a read only mode,