Seems I do this every time we have a new release.
In F12: cvs tag -F -c mercurial-1_4-1_fc12 ERROR: The tag mercurial-1_4-1_fc12 is already applied on a different branch ERROR: You can not forcibly move tags between branches cvs tag: Pre-tag check failed cvs [tag aborted]: correct the above errors first!
What are my choices to proceed? I already have built/are building 1.4.1 on F13 and F11. I don't want to have a different package number on F12.
On Mon, 16 Nov 2009 17:02:01 -0500, Neal wrote:
Seems I do this every time we have a new release.
How about you avoid that mistake in the future? ;)
In F12: cvs tag -F -c mercurial-1_4-1_fc12 ERROR: The tag mercurial-1_4-1_fc12 is already applied on a different branch ERROR: You can not forcibly move tags between branches cvs tag: Pre-tag check failed cvs [tag aborted]: correct the above errors first!
You've applied this tag to the devel dir.
What are my choices to proceed?
Bump %release in F-12 and devel, commit, make tag again.
On Monday 16 November 2009 04:02:01 pm Neal Becker wrote:
Seems I do this every time we have a new release.
In F12: cvs tag -F -c mercurial-1_4-1_fc12 ERROR: The tag mercurial-1_4-1_fc12 is already applied on a different branch ERROR: You can not forcibly move tags between branches cvs tag: Pre-tag check failed cvs [tag aborted]: correct the above errors first!
What are my choices to proceed? I already have built/are building 1.4.1 on F13 and F11. I don't want to have a different package number on F12.
your only option is to bump and tag you can use either 1.4-2 or 1.4-1.1 but you can do cross branch tagging. so there is no way to tag 1.4-1 on the f-12 branch.
Dennis
On Mon, 16 Nov 2009 16:26:39 -0600, Dennis wrote:
On Monday 16 November 2009 04:02:01 pm Neal Becker wrote:
Seems I do this every time we have a new release.
In F12: cvs tag -F -c mercurial-1_4-1_fc12 ERROR: The tag mercurial-1_4-1_fc12 is already applied on a different branch ERROR: You can not forcibly move tags between branches cvs tag: Pre-tag check failed cvs [tag aborted]: correct the above errors first!
What are my choices to proceed? I already have built/are building 1.4.1 on F13 and F11. I don't want to have a different package number on F12.
your only option is to bump and tag you can use either 1.4-2 or 1.4-1.1 but
To be precise, avoid 1.4-1.1 as it would be higher than 1.4-1.fc13
Use 1.4-1%{?dist}.1 instead for F-12 if you don't want to bump to 1.4-2%{?dist} for both F-12 and devel.
On Monday 16 November 2009 04:49:31 pm Michael Schwendt wrote:
On Mon, 16 Nov 2009 16:26:39 -0600, Dennis wrote:
On Monday 16 November 2009 04:02:01 pm Neal Becker wrote:
Seems I do this every time we have a new release.
In F12: cvs tag -F -c mercurial-1_4-1_fc12 ERROR: The tag mercurial-1_4-1_fc12 is already applied on a different branch ERROR: You can not forcibly move tags between branches cvs tag: Pre-tag check failed cvs [tag aborted]: correct the above errors first!
What are my choices to proceed? I already have built/are building 1.4.1 on F13 and F11. I don't want to have a different package number on F12.
your only option is to bump and tag you can use either 1.4-2 or 1.4-1.1 but
To be precise, avoid 1.4-1.1 as it would be higher than 1.4-1.fc13
No it won't I could have been cleaer 1.4-1%{?dist}.1 is what i meant. but i assumed that the implementer would have done it as such.
Use 1.4-1%{?dist}.1 instead for F-12 if you don't want to bump to 1.4-2%{?dist} for both F-12 and devel.
I was intentionally leaving the %{?dist} macro out and putting it in the changelog format. I assume that our packagers are smart enough to do the right thing (tm)
Dennis
-
Dennis Gilmore -
Michael Schwendt -
Neal Becker