11:52 a.m.
Hello
I think I better open a new thread.
I am using Xemacs 21.4.21 with vc pkg: 1.41.
together with the RCS backend.
According to
http://xtalk.msk.su/~ott/en/writings/emacs-vcs/EmacsVC.html#sec7
Vc should support branches using the command:
(vc-next-action 1)
(That is without the argument vc does not create branches.)
So what I expect is.
* creation and registration of file.
* add a new line check in. Check out
* want to create a branch 1.2.1 (will be numbered 1.2.1.1)
* continue with the branch modify it 1.2.1.2
* continue with the branch want to return to the tree
* modify and check in 1.4
GNU emacs does this, however Xemacs does not and I am wondering whether
the culprit is vc being too old.
Detailed explanation:
GNU emacs
1.1 first line insert Id and Log header, register
result:
--8<------------------------schnipp------------------------->8---
# $Id: test-rcs.txt,v 1.1 2009/01/29 11:34:17 oub Exp $
# $Log: test-rcs.txt,v $
# Revision 1.1 2009/01/29 11:34:17 oub
# Initial revision
#
First line, header register
--8<------------------------schnapp------------------------->8---
1.2 check out, add text and check in.
Result.
--8<------------------------schnipp------------------------->8---
# $Id: test-rcs.txt,v 1.2 2009/01/29 11:35:56 oub Exp $
# $Log: test-rcs.txt,v $
# Revision 1.2 2009/01/29 11:35:56 oub
# add text
#
# Revision 1.1 2009/01/29 11:34:17 oub
# Initial revision
#
First line, header register
1.2 add text
--8<------------------------schnapp------------------------->8---
1.2.1.1 create branch with (vc-next-action 1)
RESULT
--8<------------------------schnipp------------------------->8---
# $Id: test-rcs.txt,v 1.2.1.1 2009/01/29 11:37:00 oub Exp $
# $Log: test-rcs.txt,v $
# Revision 1.2.1.1 2009/01/29 11:37:00 oub
# this will be the branch 1.2.1
#
# Revision 1.2 2009/01/29 11:35:56 oub
# add text
#
# Revision 1.1 2009/01/29 11:34:17 oub
# Initial revision
#
First line, header register
1.2 add text
1.2.1.1 create branch
--8<------------------------schnapp------------------------->8---
NOTE modeline shows RCS-1.2.1.1
Check out, add text and check in (vc-next-action nil)
RESULT
--8<------------------------schnipp------------------------->8---
# $Id: test-rcs.txt,v 1.2.1.2 2009/01/29 11:39:20 oub Exp $
# $Log: test-rcs.txt,v $
# Revision 1.2.1.2 2009/01/29 11:39:20 oub
# branch 1.2.1.2
#
# Revision 1.2.1.1 2009/01/29 11:37:00 oub
# this will be the branch 1.2.1
#
# Revision 1.2 2009/01/29 11:35:56 oub
# add text
#
# Revision 1.1 2009/01/29 11:34:17 oub
# Initial revision
#
First line, header register
1.2 add text
1.2.1.1 create branch
1.2.1.2 add text and check in
--8<------------------------schnapp------------------------->8---
Return to the tree with (vc-next-action 1)
Modify and check in
RESULT.
--8<------------------------schnipp------------------------->8---
# $Id: test-rcs.txt,v 1.3 2009/01/29 11:40:46 oub Exp $
# $Log: test-rcs.txt,v $
# Revision 1.3 2009/01/29 11:40:46 oub
# 1.3 in tree
#
# Revision 1.2 2009/01/29 11:35:56 oub
# add text
#
# Revision 1.1 2009/01/29 11:34:17 oub
# Initial revision
#
First line, header register
1.2 add text
1.3 in tree
--8<------------------------schnapp------------------------->8---
XEMACS fails when it comes to (vc-next-action 1).
It creates the branch:
--8<------------------------schnipp------------------------->8---
%% $Id: test-rcs.txt,v 1.2.1.1 2009/01/29 11:25:38 oub Exp $
%% $Log: test-rcs.txt,v $
%% Revision 1.2.1.1 2009/01/29 11:25:38 oub
%% 1.2.1
%%
%% Revision 1.2 2009/01/29 11:25:13 oub
%% new lin
%%
%% Revision 1.1 2009/01/29 11:24:55 oub
%% Initial revision
%%
%% Time-stamp: <test-rcs.txt Changed by: Uwe Brauer, Thu Jan 29 12:25 2009>
First line and registration.
1.2 new line
1.2.1 start branch
--8<------------------------schnapp------------------------->8---
Note the Modeline only shows RCS-1.2 and not RCS-1.2.1.1 as GNUS
but when checking out the branch disappears and one is back in the tree
1.2
--8<------------------------schnipp------------------------->8---
%% $Id: test-rcs.txt,v 1.2 2009/01/29 11:25:13 oub Exp oub $
%% $Log: test-rcs.txt,v $
%% Revision 1.2 2009/01/29 11:25:13 oub
%% new lin
%%
%% Revision 1.1 2009/01/29 11:24:55 oub
%% Initial revision
%%
%% Time-stamp: <test-rcs.txt Changed by: Uwe Brauer, Thu Jan 29 12:25 2009>
First line and registration.
1.2 new line --8<------------------------schnapp------------------------->8---
Can anybody please confirm this??
Uwe Brauer
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-beta
12:40 p.m.
Uwe Brauer writes:
I am using Xemacs 21.4.21 with vc pkg: 1.41.
together with the RCS backend.
AFAIK, current version is 1.45 (maybe that's pre-release, I'm building
from source), and C-u C-x v v allows me to specify the version. When
I specify a branch version, it creates the branch and automatically
assigns an appropriate version.
Note the Modeline only shows RCS-1.2 and not RCS-1.2.1.1 as GNUS
but when checking out the branch disappears and one is back in the tree
1.2
I don't see this. I see RCS-1.2.1.1.
Try updating to the prerelease package.
Steve
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-beta
1:43 p.m.
New subject: 1.45 generates branches but can't go back to the tree (was: BUG: vc does not work with branches, but in GNU emacs it does.)
>>>> "Stephen" == Stephen J Turnbull
<stephen(a)xemacs.org> writes:
Uwe Brauer writes:
> I am using Xemacs 21.4.21 with vc pkg: 1.41.
> together with the RCS backend.
AFAIK, current version is 1.45 (maybe that's pre-release,
I'm
building from source), and C-u C-x v v allows me to specify the
version. When I specify a branch version, it creates the branch
and automatically assigns an appropriate version.
It is in pre release and you are right generating branches does work in
this version:
*however* can you successfully move out the branch and return to the
tree??
I can't if I try to return (using C-u C-x v v)
then I am faced with either typing
new version 1.3
But then I obtain:
--8<------------------------schnipp------------------------->8---
test-rcs.txt,v <-- test-rcs.txt
ci: test-rcs.txt,v: no lock set by oub for revision 1.2
--8<------------------------schnapp------------------------->8---
If I use
New version 1.2 I obtain:
--8<------------------------schnipp------------------------->8---
test-rcs.txt,v <-- test-rcs.txt
ci: test-rcs.txt,v: revision 1.2 too low; must be higher than 1.2
--8<------------------------schnapp------------------------->8---
That is in the case of xemacs -vanilla.
If you start it with all my packages then the second possibility,
(using version 1.2) causes a crash of xemacs with no bug trace left.
Uwe
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-beta
3:13 p.m.
New subject: 1.45 generates branches but can't go back to the tree (was: BUG: vc does not work with branches, but in GNU emacs it does.)
Uwe Brauer writes:
*however* can you successfully move out the branch and return to the
tree??
I can't if I try to return (using C-u C-x v v)
Yes, I can change versions to an existing version. I needed to revert
to "master" first. I think C-x v v is very sensitive to exactly where
you are in the cycle.
I don't see the errors you do (I haven't tried very much yet, but
things seem to work pretty smoothly).
I'm not sure what's going on with the crash. If you can reproduce it,
try running under the debugger and see if you can get a backtrace.
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-beta
3:06 p.m.
New subject: menu does not work (was: BUG: vc does not work with branches, but in GNU emacs it does.)
>>>> "Stephen" == Stephen J Turnbull
<stephen(a)xemacs.org> writes:
AFAIK, current version is 1.45 (maybe that's pre-release, I'm
building
from source), and C-u C-x v v allows me to specify the version. When
I specify a branch version, it creates the branch and automatically
assigns an appropriate version.
Another problem with 1.45 when trying to use the menu I obtain:
itimer
"run-with-idle-timer<2>" signaled: (error "Attempt to enter
command_loop_3 inside menu callback") Attempt to enter command_loop_3
inside menu callback
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-beta
7:40 p.m.
New subject: menu does not work (was: BUG: vc does not work with branches, but in GNU emacs it does.)
On Thursday 29 January 2009, Uwe Brauer wrote:
>>>>> "Stephen" == Stephen J Turnbull
<stephen(a)xemacs.org> writes:
>
> AFAIK, current version is 1.45 (maybe that's pre-release, I'm building
> from source), and C-u C-x v v allows me to specify the version. When
> I specify a branch version, it creates the branch and automatically
> assigns an appropriate version.
Another problem with 1.45 when trying to use the menu I obtain:
itimer
"run-with-idle-timer<2>" signaled: (error "Attempt to enter
command_loop_3 inside menu callback") Attempt to enter command_loop_3
inside menu callback
What "the menu"? Is this still with XEmacs 21.4.x?
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-beta
9:22 a.m.
New subject: menu does not work
>>>> "Ville" == Ville Skytt <Ville>
writes:
On Thursday 29 January 2009, Uwe Brauer wrote:
>
> Another problem with 1.45 when trying to use the menu I obtain:
>
> itimer
> "run-with-idle-timer<2>" signaled: (error "Attempt to enter
> command_loop_3 inside menu callback") Attempt to enter command_loop_3
> inside menu callback
What "the menu"? Is this still with XEmacs 21.4.x?
It seems that my answer did not go through.
Yes this is Xemacs 21.4.21 and I do
Tools-->Version Control
The funny thing is the menu works for registering the file and the first
check in then this strange behavior starts. Odd very odd.
Uwe
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-beta
3:34 p.m.
New subject: vc-status is gone (was: BUG: vc does not work with branches, but in GNU emacs it does.)
>>>> "Stephen" == Stephen J Turnbull
<stephen(a)xemacs.org> writes:
In pkg vc-1.41
vc-hooks had a function called
(defun vc-status (file)
Which I used in the following trivial function
(defun my-vc-status-insert ()
(interactive)
(insert "Version")
(insert (vc-status buffer-file-name))) ;Version:1.18
Now vc-status is gone (but nothing is said in the ChangeLog)
A similar function can be found
(defun vc-state (file)
"Return the version con
However
(defun my-vc-status-insert-2 ()
(interactive)
(insert "Version")
(insert (vc-state buffer-file-name)))
Does not work but gives me the following error:
--8<------------------------schnipp------------------------->8---
Debugger entered--Lisp error: (wrong-type-argument char-or-string-p edited)
insert(edited)
(lambda nil (interactive) (insert "Version") (insert (vc-state
buffer-file-name)))()
call-interactively(my-vc-status-insert-2)
command-execute(my-vc-status-insert-2 t)
execute-extended-command(nil)
call-interactively(execute-extended-command)
--8<------------------------schnapp------------------------->8---
Any idea?
Uwe
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-beta
5563
days inactive
5565
days old
7 comments
3 participants
participants (3)
-
Stephen J. Turnbull -
Uwe Brauer -
Ville Skyttä