On Thu, Nov 23, 2006 at 02:08:45AM -0300, Manuel Qui?ones wrote:

[...]
what should I do with the revnumber in the revision tag? Should I increase it manually or what? This generates conflicts with my local copy every time I send a patch.

I've found this in the archive:

http://archives.free.net.ph/message/20060311.101522.26dab6d2.en.html

Should I leave it as $revision:$ ?

Yes - leave it as $revision$. It is replaced by the actual revision number by the CVS.

Greetings,

On Thu, Nov 23, 2006 at 09:58:42AM +0100, Roman Joost wrote:

On Thu, Nov 23, 2006 at 02:08:45AM -0300, Manuel Qui?ones wrote:

[...]
what should I do with the revnumber in the revision tag? Should I increase it manually or what? This generates conflicts with my local copy every time I send a patch.

I've found this in the archive:

http://archives.free.net.ph/message/20060311.101522.26dab6d2.en.html

Should I leave it as $revision:$ ?

Yes - leave it as $revision$. It is replaced by the actual revision number by the CVS.

Dumber + dumb: would you please indicate me where I can find info about this way of handling revisions? I do not understand (I perhaps missed some msgs of revisions explanation) the meaning, how I can use them and how to produce HTML without such messages in the way...

TIA

? ???, 23/11/2006 ? 11:58 +0100, Marco Ciampa ?????:

On Thu, Nov 23, 2006 at 09:58:42AM +0100, Roman Joost wrote:

On Thu, Nov 23, 2006 at 02:08:45AM -0300, Manuel Qui?ones wrote:

[...]
what should I do with the revnumber in the revision tag? Should I increase it manually or what? This generates conflicts with my local copy every time I send a patch.

I've found this in the archive:

http://archives.free.net.ph/message/20060311.101522.26dab6d2.en.html

Should I leave it as $revision:$ ?

Yes - leave it as $revision$. It is replaced by the actual revision number by the CVS.

Dumber + dumb: would you please indicate me where I can find info about this way of handling revisions? I do not understand (I perhaps missed some msgs of revisions explanation) the meaning, how I can use them and how to produce HTML without such messages in the way...

TIA

Well, probably you can extract some info from

http://www.eyrie.org/~eagle/notes/cvs/file-headers.html

Sometimes it's not used correctly! For example in gimp-new-layer-dialog.xml

$Revision$

I've just filed bug about it:

http://bugzilla.gnome.org/show_bug.cgi?id=378738

To avoid CVS conflicts you can just manually remote chunks from patches with revision or use "cvs diff" and "cvs update" to generate patches against latest revision.

-------------- next part -------------- A non-text attachment was scrubbed... Name: not available
Type: application/pgp-signature
Size: 191 bytes
Desc: =?koi8-r?Q?=FC=D4=C1?= =?koi8-r?Q?_=DE=C1=D3=D4=D8?= =?koi8-r?Q?_=D3=CF=CF=C2=DD=C5=CE=C9=D1?= =?koi8-r?Q?_=D0=CF=C4=D0=C9=D3=C1=CE=C1?= =?koi8-r?Q?_=C3=C9=C6=D2=CF=D7=CF=CA?= =?koi8-r?Q?_=D0=CF=C4=D0=C9=D3=D8=C0?= Url : /lists/gimp-docs/attachments/20061124/d11dcc3d/attachment.bin

Hi,

On Fri, 2006-11-24 at 09:51 +0300, Nickolay V. Shmyrev wrote:

Sometimes it's not used correctly! For example in gimp-new-layer-dialog.xml

$Revision$

That's not quite right. You should use either $Revision$ or $Revision:...$ (with the dots replaced by the actual revision number). Thus, if you start a new file, just use $Revision$ and CVS (or actually RCS) will do the substitution to the second form and will take care of updating the version then.

http://www.stud.uni-hannover.de/stud/serv/cvsdoc/cvs_17.html

Note that the case is important. $revision$ won't work, but $Revision$ is correct.

Sven

Hi,

On Fri, 2006-11-24 at 09:51 +0300, Nickolay V. Shmyrev wrote:

To avoid CVS conflicts you can just manually remote chunks from patches with revision or use "cvs diff" and "cvs update" to generate patches against latest revision.

You can use the -kk option with 'cvs diff' to suppress keyword substitution. Differences that only depend on keyword substitution are then ignored.

Sven

? ???, 24/11/2006 ? 10:28 +0100, Sven Neumann ?????:

Hi,

On Fri, 2006-11-24 at 09:51 +0300, Nickolay V. Shmyrev wrote:

Sometimes it's not used correctly! For example in gimp-new-layer-dialog.xml

$Revision$

That's not quite right. You should use either $Revision$ or $Revision:...$ (with the dots replaced by the actual revision number). Thus, if you start a new file, just use $Revision$ and CVS (or actually RCS) will do the substitution to the second form and will take care of updating the version then.

http://www.stud.uni-hannover.de/stud/serv/cvsdoc/cvs_17.html

Note that the case is important. $revision$ won't work, but $Revision$ is correct.

Yes, I am wrong here, sorry for misleading whole list :) Nobody can know everything in particular about cvs admin flags.

Anyhow, this problem should be solved now, so thanks a lot.

-------------- next part -------------- A non-text attachment was scrubbed... Name: not available
Type: application/pgp-signature
Size: 191 bytes
Desc: =?koi8-r?Q?=FC=D4=C1?= =?koi8-r?Q?_=DE=C1=D3=D4=D8?= =?koi8-r?Q?_=D3=CF=CF=C2=DD=C5=CE=C9=D1?= =?koi8-r?Q?_=D0=CF=C4=D0=C9=D3=C1=CE=C1?= =?koi8-r?Q?_=C3=C9=C6=D2=CF=D7=CF=CA?= =?koi8-r?Q?_=D0=CF=C4=D0=C9=D3=D8=C0?= Url : /lists/gimp-docs/attachments/20061128/e2895f86/attachment.bin

On Tue, Nov 28, 2006 at 05:08:23AM +0300, Nickolay V. Shmyrev wrote:

?? ??????, 24/11/2006 ?? 10:28 +0100, Sven Neumann ??????????:

Note that the case is important. $revision$ won't work, but $Revision$ is correct.

Yes, I am wrong here, sorry for misleading whole list :) Nobody can know everything in particular about cvs admin flags.

Nevermind :)

Anyhow, this problem should be solved now, so thanks a lot.

I'm still not convinced if this problem is solved. If you still find files with the sticky option, please reset the options :)

Thanks and Greetings,