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. 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) ?

I renamed/moved maint to maint-4-x 
(see commands below)

The main idea was that maint until now has had fixes for 4.x, where mainly 
master was for version 5. I now want to move 5.0.x to maint, which receive 
further maintenance for shure, while preserving a way to maintain also 4.x if 
necessary, though I do expect very few changes.

And the idea also is to merge the rpi branch into master, that means master 
will be moved feature-wise to a 3.10 kernel etc and the main development 
branch and base for the next major version (5.1).

> In any case we only do fast-forward for integration branch !!
> 
> I have update the Git Workflow guide to explain how to manage the maint
> branch after a new release: http://goo.gl/dAxfQ2

I've read that, but I do not understand, sorry.

Given that we only had maint branch, and that the command I know to create a 
new branch is

git branch current-branch new branch


the command in the docs, looks to me the other way round. I would have 
expected

git branch maint maint-X.(Y-1)


> so in our case we need to COPY the old maint branch to another name:
> maint-4.x if we want to continue to maintain it or v4.x if the branch will
> not get updates: git branch maint-4.x maint
> or
> git branch v4.x maint

See above.

Just asking, before I make more errors.


> After that we need to fast forward the maint branch to master so the master
> branch become the new maint branch: git checkout maint
> git merge —ff-only master
> 
> After that we can work on master like before and tag the new releases.
> 
> Sorry for the time to reply but i don’t see your message during christmas
> holidays.

No pb, thx for responding and patience.

I learned a lot the last year about working with git, and I hope at the end of 
the year I'll be able to doing basic tasks error-free :)


btw: how can we fix the wrong rename/move of maint to maint-4.x?
kp


> Le 4 janv. 2014 à 20:19, KP Kirchdörfer <kap...@users.sourceforge.net> a 
écrit :
> > 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 to merge the rpi branch into master as new master.
> > 
> > First I merged rpi and master locally, and with Yves hints given earlier
> > how to resolve issues shown with "git status" I've build a new local
> > branch, from which I've build the above mentioned versions runing on my
> > router and the raspberry. So this part went well.
> > 
> > Renaming remote branches is another task. I've googled around and found
> > the
> > easiest way to accomplish this task with the commands:
> > 
> > 
> > git branch -m old_branch new_branch         # Rename branch locally
> > git push origin :old_branch                 # Delete the old branch
> > git push --set-upstream origin new_branch   # Push the new branch, set
> > local branch to track the new remote
> > 
> > I did that to test with the "maint" branch (movng to maint-4.x), seeming
> > uncritical to me.
> > While it worked locally, I'm unshure if other team memeber tracking the
> > branch "maint" will be moved automatically to "maint-4.x".
> > I've added a new file in the new branch for testing " TEST_GIT_MOVING".
> > 
> > 
> > Is that the correct approach to rename remote repository?
> > 
> > Does work others as well as on my side?
> > 
> > If not, what has to be done on other users client tracking the remote
> > branch?
> > 
> > kp


------------------------------------------------------------------------------
Rapidly troubleshoot problems before they affect your business. Most IT 
organizations don't have a clear picture of how application performance 
affects their revenue. With AppDynamics, you get 100% visibility into your 
Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!
http://pubads.g.doubleclick.net/gampad/clk?id=84349831&iu=/4140/ostg.clktrk

_______________________________________________
leaf-devel mailing list
leaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/leaf-devel

Reply via email to