Skip to content

Allow changelist in multiple branch #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
HoosLaszlo wants to merge 1 commit into from
Closed

Allow changelist in multiple branch #19

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 17 additions & 8 deletions p4-fusion/main.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,15 +427,24 @@ int Main(int argc, char** argv)
}

// Check if all changelists appear only once
std::set<std::string> uniqueChangeListNumbers;
for (const ChangeList& cl : changes)
{
uniqueChangeListNumbers.insert(cl.number);
}
if (uniqueChangeListNumbers.size() != changes.size())
{
ERR("Changelists appear more than once. Exiting.");
return 1;
std::set<std::string> uniqueChangeListNumbers;
std::set<std::string> notUniqueChangeListNumbers;
for (const ChangeList& cl : changes)
{
if (!uniqueChangeListNumbers.insert(cl.number).second)
{
notUniqueChangeListNumbers.insert(cl.number);
}
}
if (!notUniqueChangeListNumbers.empty())
{
ERR("Changelists appear more than once. Exiting.");
for (const auto& cl : notUniqueChangeListNumbers)
{
ERR("Duplicate changelist: " << cl);
}
}
}

// Return early if we have no work to do
Expand Down