incubator-cloudstack-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Donal Lafferty <donal.laffe...@citrix.com>
Subject Upload Diff to Review Board fails on 'file not found in the repository'
Date Tue, 29 Jan 2013 13:51:47 GMT
Has anyone seen the complaint 'The file "<file>" (revision <revision>) was not
found in the repository' ?

E.g. I get 'The file "agent/src/com/cloud/agent/resource/HypervResource.java" (revision 8b8e89d)
was not found in the repository' when uploading a diff file created with git format-patch.

However, that file is part of my diff, and was never in the cloudstack-git referenced by my
patch.



The background is that I created a patch for the master branch.  E.g.

$ git remote -v
hyperv  https://github.com/lafferty/cshv3.git (fetch)
hyperv  https://github.com/lafferty/cshv3.git (push)
origin  https://git-wip-us.apache.org/repos/asf/incubator-cloudstack.git (fetch)
origin  https://git-wip-us.apache.org/repos/asf/incubator-cloudstack.git (push)

$ git format-patch origin/master --stdout > ../hyperV-plugin_06.patch

The patch itself describes the creation of the file, an applies index 8b8e89d, as show below.

1.7.9


>From 13f9c118c724afb52b0694de539b4e1b3c38e7f7 Mon Sep 17 00:00:00 2001
From: "U-CC-SVR11\\Administrator" <Administrator@CC-SVR11.(none)>
Date: Thu, 15 Nov 2012 19:19:08 +0000
Subject: [PATCH 07/96] Starting point for ServerResource for Hyper-V is
DummyResource.

---
.../com/cloud/agent/resource/HypervResource.java   |  227 ++++++++++++++++++++
1 files changed, 227 insertions(+), 0 deletions(-)
create mode 100755 agent/src/com/cloud/agent/resource/HypervResource.java

diff --git a/agent/src/com/cloud/agent/resource/HypervResource.java b/agent/src/com/cloud/agent/resource/HypervResource.java
new file mode 100755
index 0000000..8b8e89d
--- /dev/null
+++ b/agent/src/com/cloud/agent/resource/HypervResource.java
@@ -0,0 +1,227 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at


Later, the file index changes when the file is edited.  E.g.

1.7.9


>From fef4e3f291264224ed1430b3dff1e49bea7930c9 Mon Sep 17 00:00:00 2001
From: "U-CC-SVR11\\Administrator" <Administrator@CC-SVR11.(none)>
Date: Mon, 19 Nov 2012 15:41:26 +0000
Subject: [PATCH 09/96] Add min messages for host to register with the
management server when it starts up.

---
.../com/cloud/agent/resource/HypervResource.java   |  200 ++++++++++++++++++-
1 files changed, 189 insertions(+), 11 deletions(-)

diff --git a/agent/src/com/cloud/agent/resource/HypervResource.java b/agent/src/com/cloud/agent/resource/HypervResource.java
index 8b8e89d..e810ce4 100755
--- a/agent/src/com/cloud/agent/resource/HypervResource.java
+++ b/agent/src/com/cloud/agent/resource/HypervResource.java
@@ -20,14 +20,15 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import java.util.UUID;

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message