Skip to Content.
Sympa Menu

sm-commit - Re: [SM-Commit] PERFORCE change 78279 by David Michael Leo Brown Jr. for review

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: "Jeremy Blosser (emrys)" <jblosser-smgl AT firinn.org>
  • To: "David Michael Leo Brown Jr." <dmlb2000 AT gmail.com>, Andrew Stitt <a AT t.armory.com>, Arjan Bouter <abouter AT sourcemage.org>, SM-Commit Daemon <sm-commit AT lists.ibiblio.org>, duane_malcolm <d.malcolm AT auckland.ac.nz>, Ethan Grammatikidis <eekee AT eekee.is-a-geek.org>, Gareth Clay <gareth AT caffeinefuelled.co.uk>, Ladislav Hagara <ladislav.hagara AT unob.cz>, Maurizio Boriani <baux AT member.fsf.org>, Pieter Lenaerts <e-type AT sourcemage.org>, Robin Cook <rcook AT wyrms.net>, Seth Woolley <seth AT swoolley.homeip.net>, Unet <unet AT sourcemage.org>, vladimir_marek <vlmarek AT volny.cz>
  • Subject: Re: [SM-Commit] PERFORCE change 78279 by David Michael Leo Brown Jr. for review
  • Date: Tue, 25 Apr 2006 10:19:27 -0500

On Apr 24, Arwed von Merkatz [v.merkatz AT gmx.net] wrote:
> On Mon, Apr 24, 2006 at 01:45:01AM +0100, Perforce Review Daemon wrote:
> > Change 78279 by david_brown@dmlb2000-dmlb2004 on 2006/04/24 01:44:46
> >
> > updated depends on rcs
> >
> > Affected files ...
> >
> > ... //sgl/grimoires/devel/devel/git/DEPENDS#4 edit
> > ... //sgl/grimoires/devel/devel/git/HISTORY#37 edit
> >
> > Differences ...
> >
> > ==== //sgl/grimoires/devel/devel/git/DEPENDS#4 (xtext) ====
> >
> > @@ -1,6 +1,7 @@
> > depends openssl &&
> > depends rsync &&
> > depends curl &&
> > +depends rcs &&
>
> Shouldn't this be optional? git built fine here without rcs and seems to
> work at least to get remote git trees.

Yeah, it should be optional. git will look for the merge command when it
needs to do merge resolution, but that doesn't have to come from rcs, and
git will fall back to manual merging regardless.

I'm also not sure if rsync is really a hard dependency? I'm not sure why
it would be unless you want to hit rsync repositories.

Attachment: pgpgppDqCJjmW.pgp
Description: PGP signature




Archive powered by MHonArc 2.6.24.

Top of Page