"C. Michael Pilato" <cmpil...@collab.net> writes: > On 02/23/2011 12:17 PM, Philip Martin wrote: >> Philip Martin <philip.mar...@wandisco.com> writes: >> >>> Changelists only contain files in 1.6, but in 1.7 files can be replaced >>> with directories: >>> >>> $ svn changelist qq wc/foo >>> $ svn rm wc/foo >>> $ svn mkdir wc/foo >>> >>> Does the changelist qq refer to the replacing dir foo or only to the >>> replaced file foo? > > If a directory replaces a file with a changelist, the changelist should be > removed from that path. We do not allow changelist assignments on > directories, period, making the rest of your thread irrelevant:
That's not what happens at present, I'll raise an issue. Should the mkdir fail, or should it remove the file from the changelist, or raise a tree conflict? This currently also happens during merge. -- Philip
