Fix depot-paths encoding for multi-path imports (don't split up //depot/path/foo)
Signed-off-by: Simon Hausmann <simon@lst.de>
This commit is contained in:
@ -1312,7 +1312,7 @@ class P4Sync(Command):
|
|||||||
parent = self.initialParents[branch]
|
parent = self.initialParents[branch]
|
||||||
del self.initialParents[branch]
|
del self.initialParents[branch]
|
||||||
|
|
||||||
self.commit(description, filesForCommit, branch, branchPrefix, parent)
|
self.commit(description, filesForCommit, branch, [branchPrefix], parent)
|
||||||
else:
|
else:
|
||||||
files = self.extractFilesFromCommit(description)
|
files = self.extractFilesFromCommit(description)
|
||||||
self.commit(description, files, self.branch, self.depotPaths,
|
self.commit(description, files, self.branch, self.depotPaths,
|
||||||
|
Reference in New Issue
Block a user