search

jayduhon / inferno-os

Automatically exported from code.google.com/p/inferno-os
2 stars 0 forks source link

conflict while hg update on fonts/LICENCE #208

Closed GoogleCodeExporter closed 9 years ago

GoogleCodeExporter commented 9 years ago 
What steps will reproduce the problem?
1. download and unpack http://www.vitanuova.com/dist/4e/
inferno-20090730.tgz
2. hg pull
3. hg update

What is the expected output? What do you see instead?
Expect to see no merge conflicts. :) But:

 $ hg update 
 merging fonts/LICENCE
 warning: conflicts during merge.
 merging fonts/LICENCE failed!
 47 files updated, 0 files merged, 0 files removed, 1 files unresolved
 use 'hg resolve' to retry unresolved file merges

 $ hg diff fonts/LICENCE 
 diff -r 7717b1cd5b20 fonts/LICENCE
 --- a/fonts/LICENCE     Sun Nov 01 21:50:21 2009 +0000
 +++ b/fonts/LICENCE     Mon Nov 16 22:35:47 2009 +0200
 @@ -4,7 +4,12 @@

  You MAY NOT:

 +<<<<<<< local
 +- make an ADAPTATION of files that are copyright Bigelow & Holmes found  
in the directory
 +``/font'' and its various subdirectories (``FONT SOFTWARE'').
 +=======
  - make an ADAPTATION of files that are copyright Bigelow & Holmes found 
in the Inferno distribution (``FONT SOFTWARE'').
 +>>>>>>> other
  - distribute FONT SOFTWARE except as part of a larger software 
distribution
  incorporating the Inferno system software (and any adaptations of it YOU 
may make)
  provided that the distribution includes minimum sub-licence terms as 
specified below.

What version of the product are you using? On what operating system?

Please provide any additional information below.

Original issue reported on code.google.com by powerman...@gmail.com on 16 Nov 2009 at 8:40

GoogleCodeExporter commented 9 years ago 
btw, amount of small headaches here and there because of using these non-free 
fonts 
are funny :)

Original comment by powerman...@gmail.com on 16 Nov 2009 at 8:44

GoogleCodeExporter commented 9 years ago 
just delete any existing LICENCE file and do another update.
had i realised in time that it wasn't in the original set, i could
have pushed the original version, then the updated version, and it
would not moan. unfortunately, i saw that too late. sorry.
i don't think there's a way of putting it right now.

Original comment by Charles....@gmail.com on 17 Nov 2009 at 12:18