Re: [ecf-dev] git problems

[Wim Jongman <wim.jongman@xxxxxxxxx>]

I mean, can the wrong commit be fixed?

On Sun, Mar 6, 2011 at 6:39 PM, Wim Jongman <wim.jongman@xxxxxxxxx> wrote:

Hooray for the most confusing message I have ever seen. I use Egit and I nowhere see any warnings whatsoever other that a red "Rejected" column and the "force" flag. Can this be fixed?

Thanks,

Wim

 

On Sun, Mar 6, 2011 at 1:29 PM, Markus Alexander Kuppe <ecf-dev_eclipse.org@lemmster.de> wrote:

On 03/06/2011 02:59 AM, Wim Jongman wrote:
> Hi,
>
> I had two commits where the normal push to master was rejected for some
> reason. I did sync before pushing and I also removed and pulled the
> complete repository. I checked a flag that said "Force update" and that
> seemed to to the trick.

Forcing a push always means you going to lose commits. The commit
message probably helps to understand what went wrong:

Markus

-------- Original Message --------
Subject: [SCM] Eclipse Communication Framework (ECF) branch, master,
updated. R-Release_HEAD-sdk_feature-7_2011-03-04_13-05-45-6-g4d44e5a
Date: Sat,  5 Mar 2011 20:56:10 -0500 (EST)
From: wjongman@xxxxxxxxxxx (Wim Jongman)
To: org.eclipse.ecf.git@xxxxxxxxxxxxxxx

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Eclipse Communication Framework (ECF)".

The branch, master has been updated
 discards  294b2a97670d851375034a4b9e84d81ba0bbb711 (commit)
 discards  87cde4338e314c278098665ce3e088ea8a995754 (commit)
 discards  3cc09ddee0b52adc81cb3c7cc7e3b2682a6e0ea7 (commit)
 discards  74c218777f9ee9c94a2b7002b8f60f17422191ee (commit)
      via  4d44e5ad2b312622ebae81327bd9da2ff245592b (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (294b2a97670d851375034a4b9e84d81ba0bbb711)
           \
            N -- N -- N (4d44e5ad2b312622ebae81327bd9da2ff245592b)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4d44e5ad2b312622ebae81327bd9da2ff245592b
Author: Wim Jongman <wim.jongman@xxxxxxxxxxxxxxxxxx>
Date:   Sun Mar 6 02:52:23 2011 +0100

   [Zoodiscovery] ArrayIndexOutOfBoundsException in ECF
   Discovery View
   https://bugs.eclipse.org/bugs/show_bug.cgi?id=339024

diff --git
a/providers/bundles/org.eclipse.ecf.provider.zookeeper/src/org/eclipse/ecf/provider/zookeeper/core/internal/Configuration.java
b/providers/bundles/org.eclipse.ecf.provider.zookeeper/src/org/eclipse/ecf/provider/zookeeper/core/internal/Configuration.java
index ad1763f..1c21fd8 100644
---
a/providers/bundles/org.eclipse.ecf.provider.zookeeper/src/org/eclipse/ecf/provider/zookeeper/core/internal/Configuration.java
+++
b/providers/bundles/org.eclipse.ecf.provider.zookeeper/src/org/eclipse/ecf/provider/zookeeper/core/internal/Configuration.java
@@ -60,7 +60,8 @@ public class Configuration extends
DefaultDiscoveryConfig {
               String ss[] = propsAsString.split(";");//$NON-NLS-1$
               for (String s : ss) {
                       String key_value[] = s.split("=");//$NON-NLS-1$
-                       defaultConfigProperties.put(key_value[0], key_value[1]);
+                       if (key_value.length == 2)
+                               defaultConfigProperties.put(key_value[0], key_value[1]);
               }
       }


-----------------------------------------------------------------------

Summary of changes:
 ... Service Consumer DS (zeroconf,generic).product |    4 -
 .../OSGI-INF/hello.xml                             |    2 +-
 ...ello Service DS Host (zeroconf,generic).product |    6 +-
 .../zookeeper/core/internal/Configuration.java     |    3 +-
 .../feature.xml                                    |   76 +++++++-------
 .../feature.xml                                    |   62 +++++-----
 .../feature.properties                             |    2 +-
 .../feature.xml                                    |   76 +++++++-------
 .../feature.properties                             |    2 +-
 .../feature.xml                                    |    2 +-
 .../feature.properties                             |    2 +-
 .../feature.xml                                    |   64 ++++++------
 .../feature.properties                             |    2 +-
 .../org.eclipse.ecf.eventadmin.feature/feature.xml |   84 +++++++-------
 .../feature.properties                             |    2 +-
 .../feature.xml                                    |  104
+++++++++---------
 .../feature.properties                             |    2 +-
 .../feature.xml                                    |  118
++++++++++----------
 .../build.properties                               |    2 +-
 .../features/org.eclipse.ecf.sdk/build.properties  |    5 +-
 releng/features/org.eclipse.ecf.sdk/feature.xml    |    2 +-
 21 files changed, 306 insertions(+), 316 deletions(-)

_______________________________________________
ecf-dev mailing list
ecf-dev@xxxxxxxxxxx
https://dev.eclipse.org/mailman/listinfo/ecf-dev