Hi,
I have a question about how to merge patches when they misbehave. I have
some development code in a sage 2.8.14 branch which I want to merge to the
newest version of sage on another machine (both Macs). To do this I
installed mercurial, compiled the new sage, and cloned a new branch from it
with the same name as the branch I want to receive the patches. Then on
the old machine I set the SAGE_OUTGOING_SERVER variable in my .bashrc file
to ssh to the new repository (with the xxx's replaced by an actual IP
address)
export SAGE_OUTGOING_SERVER="ssh://[EMAIL
PROTECTED]//Users/jonhanke/Documents/SAGE/sage-3.1.2/devel"
## No trailing '/' here!
and did
hg_sage.push()
while running that branch. The trouble is that this gives some error even
though the branches have the same name:
abort: push creates new remote branches!
(did you forget to merge? use push -f to force)
So then I try
hg_sage.push(options='-f')
which successfully pushes the changes. However when I try to build in the
new repository then there are more serious problems
[EMAIL PROTECTED]/Documents/SAGE/sage-3.1.2]: sage -br class_number_1
----------------------------------------------------------
sage: Building and installing modified SAGE library files.
Installing c_lib
scons: `install' is up to date.
running install
running build
running build_py
running build_ext
running build_scripts
running install_lib
running install_scripts
changing mode of
/Users/jonhanke/Documents/SAGE/sage-3.1.2/local/bin/dsage_setup.py to 755
changing mode of
/Users/jonhanke/Documents/SAGE/sage-3.1.2/local/bin/dsage_worker.py to 755
changing mode of
/Users/jonhanke/Documents/SAGE/sage-3.1.2/local/bin/spkg-debian-maybe to 755
running install_data
running install_egg_info
Removing
/Users/jonhanke/Documents/SAGE/sage-3.1.2/local/lib/python2.5/site-packages/sage-0.0.0-py2.5.egg-info
Writing
/Users/jonhanke/Documents/SAGE/sage-3.1.2/local/lib/python2.5/site-packages/sage-0.0.0-py2.5.egg-info
----------------------------------------------------------------------
| SAGE Version 3.1.2, Release Date: 2008-09-19 |
| Type notebook() for the GUI, and license() for information. |
----------------------------------------------------------------------
Loading SAGE library. Current Mercurial branch is: class_number_1
Non-default server settings detected:
Incoming Server = http://www.sagemath.org/hg (default)
Outgoing Server = ssh://
[EMAIL PROTECTED]//wtmp/sage-2.8.14/devel
sage: hg_sage.status()
Getting status of modified or unknown files:
cd "/Users/jonhanke/Documents/SAGE/sage-3.1.2/devel/sage" && hg status
---
Branch: class_number_1
sage: hg_sage.merge()
cd "/Users/jonhanke/Documents/SAGE/sage-3.1.2/devel/sage" && hg merge
merging sage/combinat/combinat.py
merging sage/ext/cdefs.pxi
warning: conflicts during merge.
merging sage/ext/cdefs.pxi failed!
merging sage/quadratic_forms/binary_qf.py
warning: conflicts during merge.
merging sage/quadratic_forms/binary_qf.py failed!
merging sage/quadratic_forms/genera/genus.py
warning: conflicts during merge.
merging sage/quadratic_forms/genera/genus.py failed!
merging sage/rings/arith.py
warning: conflicts during merge.
merging sage/rings/arith.py failed!
merging sage/rings/integer_mod.pxd
merging sage/rings/integer_mod.pyx
merging setup.py
23 files updated, 4 files merged, 0 files removed, 4 files unresolved
There are unresolved merges, you can redo the full merge using:
hg update -C 10552
hg merge 10607
sage:
Exiting SAGE (CPU time 0m0.03s, Wall time 0m42.46s).
Then I try doing the update and merge it suggests, but it doesn't seem to
fix the problem.
[EMAIL PROTECTED]/Documents/SAGE/sage-3.1.2/devel/sage-class_number_1]: hg
update -C 10552
9 files updated, 0 files merged, 22 files removed, 0 files unresolved
[EMAIL PROTECTED]/Documents/SAGE/sage-3.1.2/devel/sage-class_number_1]: hg
merge
10607
merging sage/combinat/combinat.py
merging sage/ext/cdefs.pxi
warning: conflicts during merge.
merging sage/ext/cdefs.pxi failed!
merging sage/quadratic_forms/binary_qf.py
warning: conflicts during merge.
merging sage/quadratic_forms/binary_qf.py failed!
merging sage/quadratic_forms/genera/genus.py
warning: conflicts during merge.
merging sage/quadratic_forms/genera/genus.py failed!
merging sage/rings/arith.py
warning: conflicts during merge.
merging sage/rings/arith.py failed!
merging sage/rings/integer_mod.pxd
merging sage/rings/integer_mod.pyx
merging setup.py
23 files updated, 4 files merged, 0 files removed, 4 files unresolved
There are unresolved merges, you can redo the full merge using:
hg update -C 10552
hg merge 10607
Any idea what's happening? Thanks,
-Jon
=)
--~--~---------~--~----~------------~-------~--~----~
To post to this group, send email to sage-devel@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at http://groups.google.com/group/sage-devel
URLs: http://www.sagemath.org
-~----------~----~----~----~------~----~------~--~---
