gEDA-dev: cherry-picking/merging

[Peter TB Brett <peter-at-NOSPAMpeter-b_dot_co_dot_uk>]

On Tuesday 26 June 2007 22:20:43 Ales Hvezda wrote:
> [snip]
>
> > > I've updated the german translation. (Sorry for not asking before
> > > applying)
> >
> > Mind if I cherry-pick that to unstable?
>
> Just as an aside, I was kind of hoping to only cherry pick from master
> to the stable branches.  And furthermore I wasn't planning on merging
> the stable branches to master either.  I'll send out an e-mail about
> branching strategies at some point.

Yes.  I was going to e-mail Werner to point out that only you were meant to be 
pushing to -stable, but then realised that I didn't know whether the commit 
was a patch you applied...

> Is there any harm or future pain that would be caused by
> cherry-picking from the stable branch to master?  If not, then go
> right ahead.  Also, the po files will change when I do a make dist.

No pain at all.  I'll do it ASAP, since it still applies cleanly.

Merging from -stable to master will get increasingly difficult as master 
diverges.

Peter

-- 
Electronic Systems Engineer
Integral Informatics Ltd

PGP signature

_______________________________________________
geda-dev mailing list
geda-dev@moria.seul.org
http://www.seul.org/cgi-bin/mailman/listinfo/geda-dev