Re: [PATCH 36/37] merge-recursive: Make room for directories in D/F conflicts

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Am 9/20/2010 10:29, schrieb Elijah Newren:
> +	 * NOTE: This function relies on the fact that entries for a
> +	 * D/F conflict will appear adjacent in the index, with the
> +	 * entries for the file appearing before entries for paths
> +	 * below the corresponding directory.

I don't think that this is a generally valid assumption. There can be
other entries in between:

   this
   this.txt
   this/file

(where your focus is on "this").

-- Hannes
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]