Re: [leaf-devel] start with branch renaming/moving

2014-01-07 Thread Yves Blusseau
Le 6 janv. 2014 à 19:09, KP Kirchdörfer kap...@users.sourceforge.net a écrit : Locally I do have maint-4.x, how to proceed? btw: how can we fix the wrong rename/move of maint to maint-4.x? Yes easy :D remove local and remote branches with the commands: git checkout master git branch -d

Re: [leaf-devel] start with branch renaming/moving

2014-01-06 Thread Yves Blusseau
Hi kp, no « renaming » branch is not the right thing to do. Also removing integration branches on the repository is not a good idea :D It seems there a problem has my local maint branch is now not « attach » to a remote maint branch (do you remove or change the maint branch) ? In any case we

Re: [leaf-devel] start with branch renaming/moving

2014-01-06 Thread Erich Titl
Hi Yves on 06.01.2014 10:34, Yves Blusseau wrote: Hi kp, no « renaming » branch is not the right thing to do. Also removing integration branches on the repository is not a good idea :D It seems there a problem has my local maint branch is now not « attach » to a remote maint branch (do

Re: [leaf-devel] start with branch renaming/moving

2014-01-06 Thread Yves Blusseau
Le 6 janv. 2014 à 11:07, Erich Titl erich.t...@think.ch a écrit : Hi Yves Hi Erich All this sounds fine for the central repository, would you mind to elaborate this for the distributed (workspace) repositories? What is the canonical way distribute the new repository structure? I don’t

Re: [leaf-devel] start with branch renaming/moving

2014-01-06 Thread Erich Titl
Hi Yves on 06.01.2014 13:00, Yves Blusseau wrote: Le 6 janv. 2014 à 11:07, Erich Titl erich.t...@think.ch a écrit : Hi Yves Hi Erich All this sounds fine for the central repository, would you mind to elaborate this for the distributed (workspace) repositories? What is the canonical

Re: [leaf-devel] start with branch renaming/moving

2014-01-06 Thread Yves Blusseau
Le 6 janv. 2014 à 16:33, Erich Titl erich.t...@think.ch a écrit : If the central repository gets changed structurally, what needs to be done to the peripheral copies, are they just magically modified? If we only fast-forward central repository branches nothing specific things is needed to

Re: [leaf-devel] start with branch renaming/moving

2014-01-06 Thread KP Kirchdörfer
Hi Yves; I knew I made something wrong :) Because of that I started only with the old maint branch, which I hoped wouldn't be that harmful, and didn't touch anything else. Am Montag, 6. Januar 2014, 10:34:30 schrieb Yves Blusseau: Hi kp, no « renaming » branch is not the right thing to do.

Re: [leaf-devel] start with branch renaming/moving

2014-01-06 Thread Yves Blusseau
Le 6 janv. 2014 à 17:31, KP Kirchdörfer kap...@users.sourceforge.net a écrit : Hi Yves; I knew I made something wrong :) Because of that I started only with the old maint branch, which I hoped wouldn’t be that harmful, and didn't touch anything else. It hard to break (not recoverable)

Re: [leaf-devel] start with branch renaming/moving

2014-01-06 Thread KP Kirchdörfer
Am Montag, 6. Januar 2014, 18:00:08 schrieb Yves Blusseau: Le 6 janv. 2014 à 17:31, KP Kirchdörfer kap...@users.sourceforge.net a écrit : Hi Yves; I knew I made something wrong :) Because of that I started only with the old maint branch, which I hoped wouldn’t be that harmful, and

[leaf-devel] start with branch renaming/moving

2014-01-04 Thread KP Kirchdörfer
Hi; I've recently updated my router to run with a kernel 3.10.25 and it works - as you when reading this mail :). I've also get a raspberry pi up and running with the same kernel and build from the rpi branch. So I think it's time, as proposed a few days ago, to move master to maint, and