At Thu, 19 Jul 2007 17:06:18 -0400,
Davor Ocelic wrote:
> Trying to run the git-update-index command manually, I get:
> 
> $  git update-index --add notes/design notes/execution notes/features
> notes/goals notes/issues notes/notes
> error: 'notes/design' appears as both a file and as a directory
> error: notes/design: cannot add to the index - missing --add option?
> fatal: Unable to process path notes/design
> 
> 
> What can I do to extract the relevant SVN log and see why is the file
> treated as both file and directory?

You should get the "svn log" of revision 51 from the upstream
repository; I can imagine what has been done:

$ touch notes/design
$ svn add notes/design
$ svn commit -m "added design document" notes/design
$ svn rm notes/design
$ svn mv notes/Design.d notes/design
$ svn commit -m "replaced with a dir" notes

If this is the case, what should be given to "git update-index"?

This reminds me a nice feature tailor could be teached about:
splitting source changeset in more than one target changeset, when the
target can't replay it for whatever reason.

ciao, lele.
_______________________________________________
Tailor mailing list
[email protected]
http://lists.zooko.com/mailman/listinfo/tailor

Reply via email to