[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-scm-interest
Subject:    Re: [Kde-scm-interest] Meeting minutes
From:       Oswald Buddenhagen <ossi () kde ! org>
Date:       2009-11-16 21:40:26
Message-ID: 20091116214026.GA9741 () ugly ! local
[Download RAW message or body]

On Mon, Nov 16, 2009 at 01:26:16PM -0800, Chani Armitage wrote:
> what's p4i? what does "merge up" mean? :)
> 
:D
p4i is a troll-internal script. it kinda-automated forward-porting
changes from stable to master when we still used perforce (p4).
in git, you just check out master and "git merge stable" to get *all*
changes from stable (that's also the basis for the "merging mess"
discussion). that's called "merging up" or forward-merging, or whatever
one decides to call it.
the alternative to using git's merging feature whould be cherry-picking
individual changes. that's about as comfortable as forward-/back-porting
in svn without merge tracking (i.e., what we've done since the dawn of
times). but you really don't *want* that.
_______________________________________________
Kde-scm-interest mailing list
Kde-scm-interest@kde.org
https://mail.kde.org/mailman/listinfo/kde-scm-interest
[prev in list] [next in list] [prev in thread] [next in thread]