Re: [Ada-mode-users] GPR problem

[Stephen Leake]

Simon Wright <address@hidden> writes:

> I found that if I have a line like
>
>       for Default_Switches ("c") use ("-g", "-O0");
>
> and I put point before 'use' and RET, I get a missing cl-case error, which 
> this fixes:
>
> $ git diff
> diff --git a/gpr-wisi.el b/gpr-wisi.el
> index 586fa5d..26a5c53 100644
> --- a/gpr-wisi.el
> +++ b/gpr-wisi.el
> @@ -78,6 +78,8 @@ or containing ancestor of CACHE that is at a line 
> beginning."
>           cache))
>         (close-paren (wisi-indent-paren 0))
>         (open-paren nil); let after-keyword handle it
> +        (statement-other
> +         (gpr-wisi-indent-containing ada-indent-broken cache))
>         (statement-start
>          (if (not (wisi-get-containing-cache cache))
>              ;; at bob

Thanks.

> (sorry about the git-ness: I no longer have write access to
> ada-france, 

That's a good reason for me to drop ada-france as well. I've been
resisting, because I _really_ prefer monotone for development work; it
tracks renames and handles merging much more nicely than git. Sigh.

I started to play with exporting mtn to git; did you do that to get your
git version of ada-mode?

One mode of operation would be to use mtn for local work, and push to a
Savannah git repository occasionally.

> and even using pull instead of sync I fell foul of getting MTN to use
> Emacs for merging. I really need a hands-on training session for that)

I use DVC for the Emacs mtn front end; it's available from ada-france in
branch org.emacs.dvc (assuming you have read access).

Attached is a .info file that might help (compiled from
dvc/texinfo/dvc-intro.texi). Merging is done with 'dvc-propagate-one';
it assumes you have the two branches checked out in different
workspaces. The document is out of date; 'dvc-propagate-one' is called
'xmtn-propagate-one' there, and there may be other differences.

I use DVC as the git front end as well; most of the concepts are the
same, but there is no conflict resolution (git just silently does the
wrong thing :( ).

We could arrange a Skype session if you'd like; email me off list.

-- 
-- Stephe

dvc-intro.info
Description: Binary data