Geek Answers Handbook

How to resolve a clash with Mercury?

I use Mercurial as a control source with the main repository managed on KILN. At some point, I changed the name of the iOS project from WeatherTimeMachine to weathertimemachine. As a result, several files and folders failed:

  • WeatherTimeMachine.xcode
  • WeatherTimeMachine_Prefix.pch
  • WeatherTimeMachine-Info.plist

In the meantime, I added a tag to the revision in KILN ... So now I have:

  • head in kiln
  • title of my local repo with case changes

When you try to merge, you receive the following error message: "Mercury case-bending collisions"

How can i fix this?

+5
source share
6 answers

: FixingCaseCollisions, - . :

( ). :

  • cp -r WeatherTimeMachine WeatherTimeMachineCopy

, , :

  • hg debugsetparents <bad revision>
  • hg debugrebuildstate

, (-f ). :

  • hg rm -A -f WeatherTimeMachine-Info.plist

,

  • hg ci -m "fixed collision-folding issue" -u michael

  • hg debugsetparents tip
  • hg debugrebuildstate

, .

MacHg, Mercurial KILN.

+5

Mac OS X, Linux , Mercurial. Disk Utility , , , , .

+4

- no-hg-, -! ..

"" . , "" , .

( ) - . , .

Disk Utility, os, , Mac OS Extended (Case-sensitive, Journaled) . , Disk Utility ( ) .

, , , IDE ( , ).

+4

, , , HG. , "Foo.txt" "foo.txt":

> hg rename Foo.txt Foo.txt.renamed
> hg rename Foo.txt.renamed foo.txt

, , , . , , , , .

+2

Mac OS X ( - cmd-D) .

0

OSX , , .

, :

hg clone -r 7

- .hgignore .

0

More articles:


All Articles