Your message dated Fri, 10 Jun 2011 21:18:04 +0000 (UTC)
with message-id <[email protected]>
and subject line cvs diff -r $branchpointtag -r HEAD selects HEAD on sticky-tag
branch
has caused the Debian Bug report #255999,
regarding cvs diff -r $branchpointtag -r HEAD selects wrong revision for HEAD
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
255999: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=255999
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: cvs
Version: 1:1.12.9-1
Severity: important
When a file has not changed in trunk since the creation of the branch,
requesting for changes on trunk causes changes in the current
directory to be returned.
As cvs log shows, the HEAD is rev 1.9 here, that is the same as the
branchpoint tag:
| wesnoth/cvs$ cvs -q log -h Makefile.am
| RCS file: /cvsroot/wesnoth/wesnoth/Makefile.am,v
| Working file: Makefile.am
| head: 1.9
| branch:
| locks: strict
| access list:
| symbolic names:
| branch_gettext1: 1.9.0.2
| branchpoint_gettext1: 1.9
| [...]
So for this file the diff should be empty. However, cvs insists on
selecting my branch's head instead:
| wesnoth/cvs$ cvs -q diff -u -r branchpoint_gettext1 -r HEAD Makefile.am
| Index: Makefile.am
| ===================================================================
| RCS file: /cvsroot/wesnoth/wesnoth/Makefile.am,v
| retrieving revision 1.9
| retrieving revision 1.9.2.2
| diff -u -r1.9 -r1.9.2.2
| --- Makefile.am 6 Apr 2004 23:29:46 -0000 1.9
| +++ Makefile.am 22 Jun 2004 21:30:33 -0000 1.9.2.2
| [...]
If I run the same command from a trunk checkout, the expected empty
diff is returned. So it really seems "-r HEAD" is simply ignored,
probably because of a wrong assumption.
However, for those files that did change on trunk since the
branchpoint, the correct diffs are reported.
This is from the wesnoth repository on savannah, should someone want
to reproduce from there.
--
Yann Dirson <[email protected]> |
Debian-related: <[email protected]> | Support Debian GNU/Linux:
| Freedom, Power, Stability, Gratis
http://ydirson.free.fr/ | Check <http://www.debian.org/>
--- End Message ---
--- Begin Message ---
Hi,
you wrote:
> So for this file the diff should be empty. However, cvs insists on
> selecting my branch's head instead:
> If I run the same command from a trunk checkout, the expected empty
> diff is returned. So it really seems "-r HEAD" is simply ignored,
> probably because of a wrong assumption.
This is actually documented behaviour: you have a “sticky tag” set,
so all operations work on the branch by default, so you end up with
the HEAD of the sticky tag.
I see that wesnoth is no longer using CVS, sadly, but at least I got
this confusion cleared up eventually ;-)
bye,
//mirabilos
--
22:59⎜<Vutral> glaub ich termkit is kompliziert | glabe nicht das man
damit schneller arbeitet | reizüberflutung │ wie windows │ alles evil
zuviel bilder │ wie ein spiel | 23:00⎜<Vutral> die meisten raffen auch
nicht mehr von windows | 23:01⎜<Vutral> bilderbücher sind ja auch nich
wirklich verbreitet als erwachsenen literatur ‣ who needs GUIs thus?
--- End Message ---
