kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Warn about conflicting p4 branch mappings and use the first one found. 

Signed-off-by: Simon Hausmann <simon@lst.de>
maint
Simon Hausmann 2007-06-17 15:10:24 +02:00
parent 6555b2ccfe
commit 1a2edf4e8d
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/fast-import/git-p4
View File

@ -957,6 +957,12 @@ class P4Sync(Command):
source = source[len(self.depotPaths[0]):-4] source = source[len(self.depotPaths[0]):-4]
destination = destination[len(self.depotPaths[0]):-4] destination = destination[len(self.depotPaths[0]):-4]


if destination in self.knownBranches:
if not self.silent:
print "p4 branch %s defines a mapping from %s to %s" % (info["branch"], source, destination)
print "but there exists another mapping from %s to %s already!" % (self.knownBranches[destination], destination)
continue

self.knownBranches[destination] = source self.knownBranches[destination] = source


lostAndFoundBranches.discard(destination) lostAndFoundBranches.discard(destination)