Skip to Content.
Sympa Menu

sm-discuss - Re: [SM-Discuss] git and usability

sm-discuss AT lists.ibiblio.org

Subject: Public SourceMage Discussion List

List archive

Chronological Thread  
  • From: Arwed von Merkatz <v.merkatz AT gmx.net>
  • To: sm-discuss AT lists.ibiblio.org
  • Subject: Re: [SM-Discuss] git and usability
  • Date: Tue, 18 Jul 2006 19:08:22 +0200

On Tue, Jul 18, 2006 at 10:24:51AM -0500, Jeremy Blosser wrote:
> On Jul 18, Ladislav Hagara [ladislav.hagara AT unob.cz] wrote:
> > In perforce it is possible to use "p4 integrate test/abc/...
> > stable-rc/abc/..." and integrate all changes.
> > Is it possible in git?
>
> Possible, yes; recommended, no. git operates per commits, not per file
> paths. This should really be fine for us since we no longer are using
> devel day-to-day and any integration that is going to stable should be a
> discreet commit to be clean anyway. Arwed's figured out ways to "fake"
> doing directories at a time via temp branches and git-tar-tree (I think)
> for cases where it's unavoidable.

It might be necessary for some older stuff, especially things where a p4
change spans multiple spells that shouldn't all get cherry-picked. For
history lines that happened in git, cherry-picks are preferred.
It's only git-tar-tree btw, no need for temp branches, the only thing to
remember is to remove the directory first so deletions get integrated.

--
Arwed v. Merkatz Source Mage GNU/Linux developer
http://www.sourcemage.org




Archive powered by MHonArc 2.6.24.

Top of Page