[sage-release] Re: Sage 6.6.rc1 released

[Volker Braun]

On Monday, March 30, 2015 at 10:29:14 AM UTC+2, Simon King wrote:

 On 2015-03-30, Volker Braun vbrau...@gmail.com javascript: wrote: 
  You can delete the extraneous files. 
 OK. But how did they come there? I thought that meanwhile there is a 
 separate folder for compiling Sage code. 


They were in the .gitignore before but the ticket that moved them also 
remove the ignore entries for the old file locations.

-- 
You received this message because you are subscribed to the Google Groups 
sage-release group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to sage-release+unsubscr...@googlegroups.com.
To post to this group, send email to sage-release@googlegroups.com.
Visit this group at http://groups.google.com/group/sage-release.
For more options, visit https://groups.google.com/d/optout.

[sage-release] Re: Sage 6.6.rc1 released

[Simon King]

Hi!

git status gives me many unbeobachtete Dateien:
src/sage/categories/category.c
src/sage/categories/category_with_axiom.c
src/sage/misc/inputhook.c
src/sage/misc/readline_extra_commands.c
src/sage/rings/padics/padic_base_coercion.c
src/sage/rings/padics/padic_base_generic_element.c
src/sage/rings/residue_field.c
src/sage/structure/bounded_integer_sequences.c

And I get errors in
  sage -t src/sage/dev/sagedev.py

Namely:

File src/sage/dev/sagedev.py, line 1143, in sage.dev.sagedev.SageDev.pull
Failed example:
alice.pull()
Expected:
Merging the remote branch u/bob/ticket/1 into the local branch ticket/1.
Automatic merge failed, there are conflicting commits.
BLANKLINE
Auto-merging alices_file
CONFLICT (add/add): Merge conflict in alices_file
BLANKLINE
Please edit the affected files to resolve the conflicts. When you are 
finished,
your resolution will be commited.
Finished? [ok/Abort] abort
Got:
Merging the remote branch u/bob/ticket/1 into the local branch ticket/1.
Automatic merge failed, there are conflicting commits.
BLANKLINE
Auto-merging alices_file
CONFLICT (add/add): Merge conflict in alices_file
Recorded preimage for 'alices_file'
BLANKLINE
Please edit the affected files to resolve the conflicts. When you are 
finished, your resolution will be commited.
Finished? [ok/Abort] abort
**
File src/sage/dev/sagedev.py, line 3128, in sage.dev.sagedev.SageDev.merge
Failed example:
alice.merge(#1)
Expected:
Merging the remote branch u/bob/ticket/1 into the local branch ticket/2.
Automatic merge failed, there are conflicting commits.
BLANKLINE
Auto-merging alice2
CONFLICT (add/add): Merge conflict in alice2
BLANKLINE
Please edit the affected files to resolve the conflicts. When you are 
finished,
your resolution will be commited.
Finished? [ok/Abort] abort
Got:
Merging the remote branch u/bob/ticket/1 into the local branch ticket/2.
Automatic merge failed, there are conflicting commits.
BLANKLINE
Auto-merging alice2
CONFLICT (add/add): Merge conflict in alice2
Recorded preimage for 'alice2'
BLANKLINE
Please edit the affected files to resolve the conflicts. When you are 
finished, your resolution will be commited.
Finished? [ok/Abort] abort
**

Is that a problem with my local git configuration? If so, how can I
solve it?

Best regards,
Simon


-- 
You received this message because you are subscribed to the Google Groups 
sage-release group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to sage-release+unsubscr...@googlegroups.com.
To post to this group, send email to sage-release@googlegroups.com.
Visit this group at http://groups.google.com/group/sage-release.
For more options, visit https://groups.google.com/d/optout.

[sage-release] Re: Sage 6.6.rc1 released

[Simon King]

Hi Volker,

On 2015-03-30, Volker Braun vbraun.n...@gmail.com wrote:
 You can delete the extraneous files.

OK. But how did they come there? I thought that meanwhile there is a
separate folder for compiling Sage code.

 It seems you have the git rerere extension enabled

Indeed I have. So, you can see that I am following your advices
sometimes...

 which leads to a 
 slightly different git output. You could add an appropriate ellipsis to the 
 doctests...

OK, I'll try.

Best regards,
Simon

-- 
You received this message because you are subscribed to the Google Groups 
sage-release group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to sage-release+unsubscr...@googlegroups.com.
To post to this group, send email to sage-release@googlegroups.com.
Visit this group at http://groups.google.com/group/sage-release.
For more options, visit https://groups.google.com/d/optout.