On Sat, Apr 2, 2011 at 5:25 PM, Keshav Kini <keshav.k...@gmail.com> wrote:
> Indeed. Mercurial's workflow is not really supposed to be carried out
> by sending patches to people (the encouraged behavior is to use `hg
> pull` from other people's repositories), so the default patch / export
> format only includes a subset of the total information so that it can
> be backwards compatible with ancient diff formats. Adding "[diff]\ngit
> = true" to your ~/.hgrc is really necessary in order to make your
> patches accurately reflect your changes (if using mq) or commits (if
> not). Besides binary files, this also exports information about file
> permission changes, for example.

Could we change the default to "git = true" as a patch to the version
of hg we distribute with Sage?   Or, alternatively, have a patch that
prints a warning
whenever Sage's hg is used but git = false?   The second option would
be safer, since a user might accidentally switch between using the
Sage hg and
a system-wide one...

>
> -Keshav
>
> On Mar 31, 4:00 pm, Ivan Andrus <darthand...@gmail.com> wrote:
>> On Mar 28, 2011, at 11:36 AM, Jeroen Demeyer wrote:
>>
>> > 2) Patches should be made using *hg export tip*, and not hg diff.
>>
>> Don't forget that you need to use --git if you have touched any binary 
>> files.  It may be best to add this to your .hgrc (I think this was mentioned 
>> in another thread recently).
>>
>> -Ivan
>
> --
> To post to this group, send an email to sage-devel@googlegroups.com
> To unsubscribe from this group, send an email to 
> sage-devel+unsubscr...@googlegroups.com
> For more options, visit this group at 
> http://groups.google.com/group/sage-devel
> URL: http://www.sagemath.org
>



-- 
William Stein
Professor of Mathematics
University of Washington
http://wstein.org

-- 
To post to this group, send an email to sage-devel@googlegroups.com
To unsubscribe from this group, send an email to 
sage-devel+unsubscr...@googlegroups.com
For more options, visit this group at http://groups.google.com/group/sage-devel
URL: http://www.sagemath.org

Reply via email to