equal
deleted
inserted
replaced
146 continue |
146 continue |
147 |
147 |
148 # bazaar tracks directories, mercurial does not, so |
148 # bazaar tracks directories, mercurial does not, so |
149 # we have to rename the directory contents |
149 # we have to rename the directory contents |
150 if kind[1] == 'directory': |
150 if kind[1] == 'directory': |
|
151 if kind[0] not in (None, 'directory'): |
|
152 # Replacing 'something' with a directory, record it |
|
153 # so it can be removed. |
|
154 changes.append((self.recode(paths[0]), revid)) |
|
155 |
151 if None not in paths and paths[0] != paths[1]: |
156 if None not in paths and paths[0] != paths[1]: |
152 # neither an add nor an delete - a move |
157 # neither an add nor an delete - a move |
153 # rename all directory contents manually |
158 # rename all directory contents manually |
154 subdir = origin.inventory.path2id(paths[0]) |
159 subdir = origin.inventory.path2id(paths[0]) |
155 # get all child-entries of the directory |
160 # get all child-entries of the directory |