1 |
On Sun, Jun 26, 2011 at 08:26:13AM +0200, Sebastian Pipping wrote: |
2 |
> On 06/26/2011 07:03 AM, William Hubbs wrote: |
3 |
> > All, |
4 |
> > |
5 |
> > I checked out a local branch from master earlier today and rebased that |
6 |
> > on catalyst_2. Now that branch has over 100 commits, which will be the |
7 |
> > combination of everything on catilyst 2 and current master. |
8 |
> > |
9 |
> > So, how would you suggest we get that branch back out where everyone can |
10 |
> > see it? Do you want me to put it back out on master? It won't be a |
11 |
> > forced update, because I used rebase instead of merge. |
12 |
> > |
13 |
> > The only catch is I don't know how broken that will leave master. |
14 |
> |
15 |
> That sentence^^^ rings at least warning bells in my ears. I don't know |
16 |
> how well you know the code, how easy conflicts were to solve. What may |
17 |
> be important is that we have little (if any) test cases and that we get |
18 |
> little help from Python and Bash to detect breakage for us. If that |
19 |
> transition adds a pile of bugs that we'll find by chance somewhere next |
20 |
> year, that would be a problem. |
21 |
|
22 |
The thing is, I think catalyst 3 is broken anyway; we need to hear from |
23 |
agaffney for sure what the status is. |
24 |
|
25 |
I know that the catalyst_2 branch is what releng is using to do their |
26 |
official builds. |
27 |
|
28 |
> Personally I may have chosen a road moving both branches towards each |
29 |
> other until their diff resolves to zero and than add a fake merge |
30 |
> commit. But that's dry theory - no idea if that would have worked well. |
31 |
> Plus I woulnd't make it alone and not in a few days or hours. |
32 |
|
33 |
I've never been able to figure out how to read merge commits when I use |
34 |
git log, so I try to stay away from them. My usual approach is to make |
35 |
master be where things come down from upstream, then I work on local |
36 |
branches. When I am ready to add something to master, I usually do |
37 |
this: |
38 |
|
39 |
git checkout master |
40 |
git pull # make sure master is up to date |
41 |
git rebase master mybranch # rebases "mybranch" changes on current master |
42 |
git checkout master |
43 |
git merge mybranch # this makes a fast-forward merge at this point |
44 |
git pull --rebase #update master with my changes at the end |
45 |
git push #add my changes to master |
46 |
|
47 |
> Please put them on a new branch (not master) while we're not sure ff the |
48 |
> resulting commits could or should be the future. |
49 |
|
50 |
Hmm, that will mean that all commits we are working on have to go to |
51 |
catalyst_2, the new branch, and master; I think that will make things |
52 |
even more complicated than they already are. |
53 |
|
54 |
I think want to try to find a way to bring the commits on catalyst_2 |
55 |
that are not on master over to master, so I may give it another shot |
56 |
before I do anything. |
57 |
|
58 |
William |