[darcs-users] about non-ASCII filenames in patches (more work needed)

Eric Kow kowey at darcs.net
Sat May 29 16:44:04 UTC 2010


We were thinking about whether or not to include the non-ASCII filenames
fix in a potential Darcs 2.4.5 (or in the upcoming Darcs 2.5 alpha).

I could agree in principle -- it'd involve some manual, rebasing which
is fine -- but I think we need to complete the work first.

Here's an example changelog extending the issue1763 test.  Note the
discrepancy between the conflictor representation.

I'll attach my modified test (it's not a proper failing test, so some thought
should be applied into turning it into one, but it gives some hints about what
I was worried about).

I'm going to see if I have a moment to see how painful it is to make a
newtype NewFormatPrim.  Perhaps that's ultimately the path of fewest
tears?

Sat May 29 17:33:45 BST 2010  Eric Kow <E.Y.Kow at brighton.ac.uk>
  * Second edit
    conflictor [
    hunk ./kit<U+00C3><U+00B6>lt<U+00C3><U+00A9>s.lisp 2
    +hello
    hunk ./kit<U+00C3><U+00B6>lt<U+00C3><U+00A9>s.lisp 3
    +hello
    ]
    |:
    hunk ./kit<U+00F6>lt<U+00E9>s.lisp 2
    +hi

Sat May 29 17:33:45 BST 2010  Eric Kow <E.Y.Kow at brighton.ac.uk>
  * My continuation of the conflict
    hunk ./kit<U+00C3><U+00B6>lt<U+00C3><U+00A9>s.lisp 3
    +hello
    addfile ./non-kit<U+00C3><U+00B6>lt<U+00C3><U+00A9>s.lisp

Sat May 29 17:33:45 BST 2010  Eric Kow <E.Y.Kow at brighton.ac.uk>
  * My conflicting edit
    hunk ./kit<U+00C3><U+00B6>lt<U+00C3><U+00A9>s.lisp 2
    +hello

Sat May 29 17:33:45 BST 2010  Eric Kow <E.Y.Kow at brighton.ac.uk>
  * First edit
    hunk ./kit<U+00C3><U+00B6>lt<U+00C3><U+00A9>s.lisp 1
    +hi

Sat May 29 17:33:45 BST 2010  Eric Kow <E.Y.Kow at brighton.ac.uk>
  * Add
    addfile ./kit<U+00C3><U+00B6>lt<U+00C3><U+00A9>s.lisp


-- 
Eric Kow <http://www.nltg.brighton.ac.uk/home/Eric.Kow>
PGP Key ID: 08AC04F9
-------------- next part --------------
A non-text attachment was scrubbed...
Name: issue1763-pull-fails-on-non-ascii-filenames.sh
Type: application/x-sh
Size: 2289 bytes
Desc: not available
URL: <http://lists.osuosl.org/pipermail/darcs-users/attachments/20100529/73cefe05/attachment-0001.sh>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.osuosl.org/pipermail/darcs-users/attachments/20100529/73cefe05/attachment-0001.pgp>


More information about the darcs-users mailing list