Skip to Content.
Sympa Menu

sm-commit - Re: [SM-Commit] PERFORCE change 79925 by Flavien Bridault 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 79925 by Flavien Bridault for review
  • Date: Mon, 29 May 2006 11:44:07 +0200

On Mon, May 29, 2006 at 10:45:01AM +0100, Perforce Review Daemon wrote:
> Change 79925 by flavien_bridault@flavien-Gargamel on 2006/05/29 10:40:27
>
> HISTORY fix, sorry, my mistake. I edited the file, realized then it
> was not the latest change. So I copied it to avoid to type again... synced
> to get latest change and... directly cp from the save to HISTORY. Stupid,
> isn't it ? :-)

Just sync and resolve it if such a thing happens. The sync won't
overwrite anything if you changed the file, the resolve will give you
the usual options of merging, editing, ...

> Affected files ...
>
> ... //sgl/grimoires/devel/graphics/imagemagick/HISTORY#46 edit
>
> Differences ...
>
> ==== //sgl/grimoires/devel/graphics/imagemagick/HISTORY#46 (text) ====
>
> @@ -1,6 +1,9 @@
> 2006-05-29 Flavien Bridault <vlaaad AT sourcemage.org>
> * DETAILS: Updated to 6.2.7-8 (bug#12365)
>
> +2006-05-24 Eric Sandall <eric AT sandall.us>
> + * DEPENDS: Depend on libxrender if xorg-server is providing X11-LIBS
> +
> 2006-05-20 Flavien Bridault <vlaaad AT sourcemage.org>
> * DETAILS: Updated to 6.2.7-7
>
> _______________________________________________
> SM-Commit mailing list
> SM-Commit AT lists.ibiblio.org
> http://lists.ibiblio.org/mailman/listinfo/sm-commit
>

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




Archive powered by MHonArc 2.6.24.

Top of Page