Skip to Content.
Sympa Menu

sm-commit - Re: [SM-Commit] PERFORCE change 77646 by Maurizio Boriani for review

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arwed von Merkatz <v.merkatz AT gmx.net>
  • To: SM-Commit Daemon <sm-commit AT lists.ibiblio.org>
  • Subject: Re: [SM-Commit] PERFORCE change 77646 by Maurizio Boriani for review
  • Date: Thu, 13 Apr 2006 12:52:56 +0200

On Wed, Apr 12, 2006 at 05:50:00PM +0100, Perforce Review Daemon wrote:
[...]
> ==== //sgl/grimoires/test/gnustep-libs/gnustep-prefsmodule/DETAILS#7
> (xtext) ====
>
> @@ -7,7 +7,13 @@
> fi
> SOURCE=PrefsModule-cvs.tar.bz2
> SOURCE_DIRECTORY=$BUILD_DIRECTORY/PrefsModule-cvs
> +>>>> ORIGINAL DETAILS#6
> +
> SOURCE_URL[0]=cvs://:pserver:anoncvs AT cvs.savannah.gnu.org:/cvsroot/backbone:System
> +==== THEIRS DETAILS#8
> +SOURCE_URL[0]=SOURCE_URL[0]=cvs://:pserver:anonymous AT cvs.savannah.nongnu.org:/sources/backbone:System
> +==== YOURS DETAILS
>
> SOURCE_URL[0]=cvs://:ext:anoncvs AT savannah.gnu.org:/cvsroot/backbone:System
> +<<<<

These are conflict markers that must _never_ make it to the repository.
If perforce tells you to resolve a file, then really resolve it before
submitting.

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




Archive powered by MHonArc 2.6.24.

Top of Page