* git svn fetch gives Index mismatch @ 2010-03-03 21:07 Felix Möller 2010-03-03 21:18 ` Andrew Myrick 0 siblings, 1 reply; 3+ messages in thread From: Felix Möller @ 2010-03-03 21:07 UTC (permalink / raw) To: git Hi, I am new to git and tried to checkout the Subversion Repository of ADempiere. https://adempiere.svn.sourceforge.net/svnroot/adempiere I get the following doing it: > [fm@thinkpad adempiere.git]$ git svn fetch > Index mismatch: fac38f8fdc7d816e9dd26b469e08a98428f3f2a5 != 0aea771bc7629d194ada8bb448e863ffe7868189 > rereading e662b48c06fb9a263f717546ffbb41a39f94d597 > M mvcForms/db/ddlutils/postgresql/functions/round.sql > M mvcForms/db/ddlutils/oracle/functions/documentNo.sql > ... > M mvcForms/client/src/org/compiere/grid/ed/VLookup.java > M mvcForms/client/src/org/compiere/print/Viewer.java > M mvcForms/client/src/org/adempiere/apps/graph/Graph.java > Couldn't find revmap for https://adempiere.svn.sourceforge.net/svnroot/adempiere/branches/stable/data/hu_HU > Couldn't find revmap for https://adempiere.svn.sourceforge.net/svnroot/adempiere/trunk/data/hu_HU > Couldn't find revmap for https://adempiere.svn.sourceforge.net/svnroot/adempiere/branches/adempiere341/zkwebui/WEB-INF/src > Couldn't find revmap for https://adempiere.svn.sourceforge.net/svnroot/adempiere/branches/stable/zkwebui/WEB-INF/src > Couldn't find revmap for https://adempiere.svn.sourceforge.net/svnroot/adempiere/trunk/extend/posterita/webui/WEB-INF/src > Couldn't find revmap for https://adempiere.svn.sourceforge.net/svnroot/adempiere/trunk/extension/posterita/webui/WEB-INF/src > Couldn't find revmap for https://adempiere.svn.sourceforge.net/svnroot/adempiere/trunk/zkwebui/WEB-INF/src > Couldn't find revmap for https://adempiere.svn.sourceforge.net/svnroot/adempiere/branches/adempiere341/base/src > Couldn't find revmap for https://adempiere.svn.sourceforge.net/svnroot/adempiere/trunk/base/src > Couldn't find revmap for https://adempiere.svn.sourceforge.net/svnroot/adempiere/trunk/migration/351a-352a > Couldn't find revmap for https://adempiere.svn.sourceforge.net/svnroot/adempiere/trunk/migration/352a-353a > merge-base e662b48c06fb9a263f717546ffbb41a39f94d597 7ac062d801daf46537377154daf39e5b21a8f447: command returned error: 1 charon on IRC helped me a lot trying to debug it. I provided the following operations: # git show fac38f8fdc7d816e9dd26b469e08a98428f3f2a5 tree fac38f8fdc7d816e9dd26b469e08a98428f3f2a5 mvcForms/ # git show 0aea771bc7629d194ada8bb448e863ffe7868189 tree 0aea771bc7629d194ada8bb448e863ffe7868189 mvcForms/ # git show e662b48c06fb9a263f717546ffbb41a39f94d597 commit e662b48c06fb9a263f717546ffbb41a39f94d597 Author: tobi42 <tobi42@f8025ce2-341d-0410-ac50-9b82273f5115> Date: Fri Oct 23 14:06:12 2009 +0000 minor compile fix git-svn-id: https://adempiere.svn.sourceforge.net/svnroot/adempiere/branches/metas@10762 f8025ce2-341d-0410-ac50-9b82273f5115 diff --git a/mvcForms/client/src/org/compiere/apps/form/VInOutGen.java b/mvcForms/client/src/org/compiere/apps/form/VInOutGen.java index 9f27863..896a340 100644 --- a/mvcForms/client/src/org/compiere/apps/form/VInOutGen.java +++ b/mvcForms/client/src/org/compiere/apps/form/VInOutGen.java -218,7 +218,7 @@ public class VInOutGen extends InOutGen implements FormPanel # git show trunk gives > # git show trunk > commit 7ac062d801daf46537377154daf39e5b21a8f447 > Author: teo_sarca <teo_sarca@f8025ce2-341d-0410-ac50-9b82273f5115> > Date: Fri Oct 23 08:14:49 2009 +0000 > > FR [ 2884541 ] MRequestUpdate should detect automatically the fields > https://sourceforge.net/tracker/?func=detail&aid=2884541&group_id=176962&atid=879335 > > git-svn-id: https://adempiere.svn.sourceforge.net/svnroot/adempiere/trunk@10757 f8025ce2-341d-0410-ac50-9b82273f5115 > > diff --git a/base/src/org/compiere/model/MRequestUpdate.java b/base/src/org/compiere/model/MRequestUpdate.java > index 00bf881..728a6fa 100644 > --- a/base/src/org/compiere/model/MRequestUpdate.java > +++ b/base/src/org/compiere/model/MRequestUpdate.java I am using git-1.6.6.1-1.fc12.i686. I'd appreciate help how to get it working. Keep in mind I am a git beginner... Thanks for your help Felix Möller ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: git svn fetch gives Index mismatch 2010-03-03 21:07 git svn fetch gives Index mismatch Felix Möller @ 2010-03-03 21:18 ` Andrew Myrick 2010-03-03 22:12 ` Felix Möller 0 siblings, 1 reply; 3+ messages in thread From: Andrew Myrick @ 2010-03-03 21:18 UTC (permalink / raw) To: Felix Möller; +Cc: git This may have been fixed with commit 41c01693ac13846c73a31c8f5c3a60206e1643be. Try git-1.7.0. -Andrew On Mar 3, 2010, at 1:07 PM, Felix Möller wrote: > Hi, > > I am new to git and tried to checkout the Subversion Repository of ADempiere. https://adempiere.svn.sourceforge.net/svnroot/adempiere > > I get the following doing it: >> [fm@thinkpad adempiere.git]$ git svn fetch >> Index mismatch: fac38f8fdc7d816e9dd26b469e08a98428f3f2a5 != 0aea771bc7629d194ada8bb448e863ffe7868189 >> rereading e662b48c06fb9a263f717546ffbb41a39f94d597 >> M mvcForms/db/ddlutils/postgresql/functions/round.sql >> M mvcForms/db/ddlutils/oracle/functions/documentNo.sql > > ... >> M mvcForms/client/src/org/compiere/grid/ed/VLookup.java >> M mvcForms/client/src/org/compiere/print/Viewer.java >> M mvcForms/client/src/org/adempiere/apps/graph/Graph.java >> Couldn't find revmap for https://adempiere.svn.sourceforge.net/svnroot/adempiere/branches/stable/data/hu_HU >> Couldn't find revmap for https://adempiere.svn.sourceforge.net/svnroot/adempiere/trunk/data/hu_HU >> Couldn't find revmap for https://adempiere.svn.sourceforge.net/svnroot/adempiere/branches/adempiere341/zkwebui/WEB-INF/src >> Couldn't find revmap for https://adempiere.svn.sourceforge.net/svnroot/adempiere/branches/stable/zkwebui/WEB-INF/src >> Couldn't find revmap for https://adempiere.svn.sourceforge.net/svnroot/adempiere/trunk/extend/posterita/webui/WEB-INF/src >> Couldn't find revmap for https://adempiere.svn.sourceforge.net/svnroot/adempiere/trunk/extension/posterita/webui/WEB-INF/src >> Couldn't find revmap for https://adempiere.svn.sourceforge.net/svnroot/adempiere/trunk/zkwebui/WEB-INF/src >> Couldn't find revmap for https://adempiere.svn.sourceforge.net/svnroot/adempiere/branches/adempiere341/base/src >> Couldn't find revmap for https://adempiere.svn.sourceforge.net/svnroot/adempiere/trunk/base/src >> Couldn't find revmap for https://adempiere.svn.sourceforge.net/svnroot/adempiere/trunk/migration/351a-352a >> Couldn't find revmap for https://adempiere.svn.sourceforge.net/svnroot/adempiere/trunk/migration/352a-353a >> merge-base e662b48c06fb9a263f717546ffbb41a39f94d597 7ac062d801daf46537377154daf39e5b21a8f447: command returned error: 1 > > charon on IRC helped me a lot trying to debug it. I provided the following operations: > # git show fac38f8fdc7d816e9dd26b469e08a98428f3f2a5 > tree fac38f8fdc7d816e9dd26b469e08a98428f3f2a5 > > mvcForms/ > # git show 0aea771bc7629d194ada8bb448e863ffe7868189 > tree 0aea771bc7629d194ada8bb448e863ffe7868189 > > mvcForms/ > # git show e662b48c06fb9a263f717546ffbb41a39f94d597 > commit e662b48c06fb9a263f717546ffbb41a39f94d597 > Author: tobi42 <tobi42@f8025ce2-341d-0410-ac50-9b82273f5115> > Date: Fri Oct 23 14:06:12 2009 +0000 > > minor compile fix > > git-svn-id: https://adempiere.svn.sourceforge.net/svnroot/adempiere/branches/metas@10762 f8025ce2-341d-0410-ac50-9b82273f5115 > > diff --git a/mvcForms/client/src/org/compiere/apps/form/VInOutGen.java b/mvcForms/client/src/org/compiere/apps/form/VInOutGen.java > index 9f27863..896a340 100644 > --- a/mvcForms/client/src/org/compiere/apps/form/VInOutGen.java > +++ b/mvcForms/client/src/org/compiere/apps/form/VInOutGen.java > -218,7 +218,7 @@ public class VInOutGen extends InOutGen implements FormPanel > > # git show trunk gives >> # git show trunk >> commit 7ac062d801daf46537377154daf39e5b21a8f447 >> Author: teo_sarca <teo_sarca@f8025ce2-341d-0410-ac50-9b82273f5115> >> Date: Fri Oct 23 08:14:49 2009 +0000 >> >> FR [ 2884541 ] MRequestUpdate should detect automatically the fields >> https://sourceforge.net/tracker/?func=detail&aid=2884541&group_id=176962&atid=879335 >> >> git-svn-id: https://adempiere.svn.sourceforge.net/svnroot/adempiere/trunk@10757 f8025ce2-341d-0410-ac50-9b82273f5115 >> >> diff --git a/base/src/org/compiere/model/MRequestUpdate.java b/base/src/org/compiere/model/MRequestUpdate.java >> index 00bf881..728a6fa 100644 >> --- a/base/src/org/compiere/model/MRequestUpdate.java >> +++ b/base/src/org/compiere/model/MRequestUpdate.java > > > I am using git-1.6.6.1-1.fc12.i686. > > I'd appreciate help how to get it working. Keep in mind I am a git beginner... > > Thanks for your help > Felix Möller > -- > To unsubscribe from this list: send the line "unsubscribe git" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: git svn fetch gives Index mismatch 2010-03-03 21:18 ` Andrew Myrick @ 2010-03-03 22:12 ` Felix Möller 0 siblings, 0 replies; 3+ messages in thread From: Felix Möller @ 2010-03-03 22:12 UTC (permalink / raw) To: Andrew Myrick; +Cc: git Hi Andrew, Am 03.03.2010 22:18, schrieb Andrew Myrick: > This may have been fixed with commit 41c01693ac13846c73a31c8f5c3a60206e1643be. Try git-1.7.0. I am now running a rebuilt git-1.7.0.1-1.fc14.i686 on Fedora 12 and get the following with it: > [fm@thinkpad adempiere.git]$ git svn fetch > ^[^NIndex mismatch: fac38f8fdc7d816e9dd26b469e08a98428f3f2a5 != 0aea771bc7629d194ada8bb448e863ffe7868189 > rereading e662b48c06fb9a263f717546ffbb41a39f94d597 > M mvcForms/db/ddlutils/postgresql/functions/round.sql > M mvcForms/db/ddlutils/oracle/functions/documentNo.sql ... > M mvcForms/client/src/org/adempiere/apps/graph/Graph.java > Couldn't find revmap for https://adempiere.svn.sourceforge.net/svnroot/adempiere/branches/stable/data/hu_HU > Couldn't find revmap for https://adempiere.svn.sourceforge.net/svnroot/adempiere/trunk/data/hu_HU > Couldn't find revmap for https://adempiere.svn.sourceforge.net/svnroot/adempiere/branches/adempiere341/zkwebui/WEB-INF/src > Couldn't find revmap for https://adempiere.svn.sourceforge.net/svnroot/adempiere/branches/stable/zkwebui/WEB-INF/src > Couldn't find revmap for https://adempiere.svn.sourceforge.net/svnroot/adempiere/trunk/extend/posterita/webui/WEB-INF/src > Couldn't find revmap for https://adempiere.svn.sourceforge.net/svnroot/adempiere/trunk/extension/posterita/webui/WEB-INF/src > Couldn't find revmap for https://adempiere.svn.sourceforge.net/svnroot/adempiere/trunk/zkwebui/WEB-INF/src > Couldn't find revmap for https://adempiere.svn.sourceforge.net/svnroot/adempiere/branches/adempiere341/base/src > Couldn't find revmap for https://adempiere.svn.sourceforge.net/svnroot/adempiere/trunk/base/src > Couldn't find revmap for https://adempiere.svn.sourceforge.net/svnroot/adempiere/trunk/migration/351a-352a > Couldn't find revmap for https://adempiere.svn.sourceforge.net/svnroot/adempiere/trunk/migration/352a-353a > W: Cannot find common ancestor between e662b48c06fb9a263f717546ffbb41a39f94d597 and 7ac062d801daf46537377154daf39e5b21a8f447. Ignoring merge info. > Couldn't find revmap for https://adempiere.svn.sourceforge.net/svnroot/adempiere/branches/adempiere341/zkwebui > Couldn't find revmap for https://adempiere.svn.sourceforge.net/svnroot/adempiere/branches/stable/zkwebui > Couldn't find revmap for https://adempiere.svn.sourceforge.net/svnroot/adempiere/trunk/zkwebui > Couldn't find revmap for https://adempiere.svn.sourceforge.net/svnroot/adempiere/branches/adempiere341/zkwebui/css > Couldn't find revmap for https://adempiere.svn.sourceforge.net/svnroot/adempiere/branches/stable/zkwebui/css > Couldn't find revmap for https://adempiere.svn.sourceforge.net/svnroot/adempiere/trunk/zkwebui/css > Couldn't find revmap for https://adempiere.svn.sourceforge.net/svnroot/adempiere/branches/adempiere341/base > Couldn't find revmap for https://adempiere.svn.sourceforge.net/svnroot/adempiere/trunk/base > Couldn't find revmap for https://adempiere.svn.sourceforge.net/svnroot/adempiere/trunk/migration/All320-340 > r10767 = e2069c625b3dc0639b31992186ab0f20da1cbf13 (refs/remotes/metas) > A tools/lib/miglayout-3.7.1-swing.jar > M tools/build.xml so it seems to be handled gracefully now. Thanks for your tip! regards Felix Möller > On Mar 3, 2010, at 1:07 PM, Felix Möller wrote: >> Hi, >> >> I am new to git and tried to checkout the Subversion Repository of ADempiere. https://adempiere.svn.sourceforge.net/svnroot/adempiere >> >> I get the following doing it: >>> [fm@thinkpad adempiere.git]$ git svn fetch >>> Index mismatch: fac38f8fdc7d816e9dd26b469e08a98428f3f2a5 != 0aea771bc7629d194ada8bb448e863ffe7868189 >>> rereading e662b48c06fb9a263f717546ffbb41a39f94d597 >>> M mvcForms/db/ddlutils/postgresql/functions/round.sql >>> M mvcForms/db/ddlutils/oracle/functions/documentNo.sql >>> ... >>> M mvcForms/client/src/org/compiere/grid/ed/VLookup.java >>> M mvcForms/client/src/org/compiere/print/Viewer.java >>> M mvcForms/client/src/org/adempiere/apps/graph/Graph.java >>> Couldn't find revmap for https://adempiere.svn.sourceforge.net/svnroot/adempiere/branches/stable/data/hu_HU >>> Couldn't find revmap for https://adempiere.svn.sourceforge.net/svnroot/adempiere/trunk/data/hu_HU >>> Couldn't find revmap for https://adempiere.svn.sourceforge.net/svnroot/adempiere/branches/adempiere341/zkwebui/WEB-INF/src >>> Couldn't find revmap for https://adempiere.svn.sourceforge.net/svnroot/adempiere/branches/stable/zkwebui/WEB-INF/src >>> Couldn't find revmap for https://adempiere.svn.sourceforge.net/svnroot/adempiere/trunk/extend/posterita/webui/WEB-INF/src >>> Couldn't find revmap for https://adempiere.svn.sourceforge.net/svnroot/adempiere/trunk/extension/posterita/webui/WEB-INF/src >>> Couldn't find revmap for https://adempiere.svn.sourceforge.net/svnroot/adempiere/trunk/zkwebui/WEB-INF/src >>> Couldn't find revmap for https://adempiere.svn.sourceforge.net/svnroot/adempiere/branches/adempiere341/base/src >>> Couldn't find revmap for https://adempiere.svn.sourceforge.net/svnroot/adempiere/trunk/base/src >>> Couldn't find revmap for https://adempiere.svn.sourceforge.net/svnroot/adempiere/trunk/migration/351a-352a >>> Couldn't find revmap for https://adempiere.svn.sourceforge.net/svnroot/adempiere/trunk/migration/352a-353a >>> merge-base e662b48c06fb9a263f717546ffbb41a39f94d597 7ac062d801daf46537377154daf39e5b21a8f447: command returned error: 1 ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-03-03 22:12 UTC | newest] Thread overview: 3+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2010-03-03 21:07 git svn fetch gives Index mismatch Felix Möller 2010-03-03 21:18 ` Andrew Myrick 2010-03-03 22:12 ` Felix Möller
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).