You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@clerezza.apache.org by Henry Story <he...@bblfish.net> on 2011/05/26 16:32:23 UTC
branching in git-svn
I am trying to work out how to do a remote branch using git-svn.
It is easy to do them locally, but I am not sure what the correct way of doing them remotely is.
Henry
Social Web Architect
http://bblfish.net/
Re: branching in git-svn
Posted by Reto Bachmann-Gmuer <re...@trialox.org>.
On Fri, May 27, 2011 at 4:42 PM, Reto Bachmann-Gmuer <
reto.bachmann@trialox.org> wrote:
> On Fri, May 27, 2011 at 3:22 PM, Reto Bachmann-Gmuer
>
>>
>> btw: the command needed to revert CLEREZZA-515 in trunk is:
>>
>> svn merge -r 1125855:1125850
>> https://svn.apache.org/repos/asf/incubator/clerezza/trunk/parent/
>>
>> svn commit -m "CLEREZZA-515: reverting changes as requested on list"
>>
>> Sorry, the above reverts to much as there are other versions in between
> (including the revert I did when you requested me to revert an issue).
>
> Now tried:
>
>
> reto@reto-HPE-540ch:~/projects/apache/clerezza/trunk/parent$ svn merge -r
> 1125855:1125854
> https://svn.apache.org/repos/asf/incubator/clerezza/trunk/parent/
> --- Reverse-merging r1125855 into '.':
> U
> platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/main/scala/org/apache/clerezza/platform/accountcontrolpanel/ProfilePanel.scala
>
This was the wrong one I think, it should be:
svn merge -r 1125854:1125853
https://svn.apache.org/repos/asf/incubator/clerezza/trunk/parent/
but I'm still getting an error:
[WARNING]
/home/reto/projects/apache/clerezza/trunk/parent/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/main/scala/org/apache/clerezza/platform/accountcontrolpanel/ProfilePanel.scala:203:
error: type mismatch;
[WARNING] found : javax.security.auth.Subject
[WARNING] required: java.lang.String
[WARNING] return userManager.getUserGraphNode(subject)
[WARNING]
^
[WARNING] one error found
It seems that CLEREZZA-516 has an undeclared dependency on CLEREZZA-515.
after doing
svn merge -r 1125850:1125849
https://svn.apache.org/repos/asf/incubator/clerezza/trunk/parent
and
svn merge -r 1125848:1125847
https://svn.apache.org/repos/asf/incubator/clerezza/trunk/parent/
It compiles again.
Reto
Re: branching in git-svn
Posted by Reto Bachmann-Gmuer <re...@trialox.org>.
On Fri, May 27, 2011 at 3:22 PM, Reto Bachmann-Gmuer
>
> btw: the command needed to revert CLEREZZA-515 in trunk is:
>
> svn merge -r 1125855:1125850
> https://svn.apache.org/repos/asf/incubator/clerezza/trunk/parent/
>
> svn commit -m "CLEREZZA-515: reverting changes as requested on list"
>
> Sorry, the above reverts to much as there are other versions in between
(including the revert I did when you requested me to revert an issue).
Now tried:
reto@reto-HPE-540ch:~/projects/apache/clerezza/trunk/parent$ svn merge -r
1125855:1125854
https://svn.apache.org/repos/asf/incubator/clerezza/trunk/parent/
--- Reverse-merging r1125855 into '.':
U
platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/main/scala/org/apache/clerezza/platform/accountcontrolpanel/ProfilePanel.scala
reto@reto-HPE-540ch:~/projects/apache/clerezza/trunk/parent$ svn merge -r
1125851:1125850
https://svn.apache.org/repos/asf/incubator/clerezza/trunk/parent/
--- Reverse-merging r1125851 into 'web.resources.style':
U
web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/globalmenu-naked.ssp
--- Reverse-merging r1125851 into 'platform.security':
U
platform.security/src/main/java/org/apache/clerezza/platform/security/auth/PrincipalImpl.java
D
platform.security/src/main/java/org/apache/clerezza/platform/security/auth/WebIdPrincipal.java
U
platform.security/src/main/java/org/apache/clerezza/platform/security/UserUtil.java
U
platform.security/src/main/java/org/apache/clerezza/platform/security/UserAwarePolicy.java
U
platform.security/src/main/java/org/apache/clerezza/platform/security/UserUnregisteredException.java
--- Reverse-merging r1125851 into 'platform.usermanager':
U
platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManager.java
U
platform.usermanager/src/main/java/org/apache/clerezza/platform/usermanager/UserManagerImpl.java
U platform.usermanager/pom.xml
--- Reverse-merging r1125851 into '.':
U
platform.dashboard/platform.dashboard.core/src/main/java/org/apache/clerezza/platform/dashboard/UserLoginNode.java
U
platform.security.foafssl/test/src/main/scala/org/apache/clerezza/foafssl/test/WebIDTester.scala
U
platform.security.foafssl/core/src/main/scala/org/apache/clerezza/foafssl/auth/FoafSslAuthentication.scala
U
platform.security.foafssl/core/src/main/scala/org/apache/clerezza/foafssl/auth/WebIDClaim.scala
--- Reverse-merging r1125851 into 'rdf.scala.utils':
U
rdf.scala.utils/src/main/scala/org/apache/clerezza/rdf/scala/utils/EasyGraph.scala
But now I get
[INFO]
------------------------------------------------------------------------
[ERROR] BUILD FAILURE
[INFO]
------------------------------------------------------------------------
[INFO] Compilation failure
/home/reto/projects/apache/clerezza/trunk/parent/platform.security/src/main/java/org/apache/clerezza/platform/security/UserUtil.java:[75,11]
cannot find symbol
symbol : variable p
location: class org.apache.clerezza.platform.security.UserUtil
Could it be that something already depends on the 515 code?
Reto
Re: branching in git-svn
Posted by Reto Bachmann-Gmuer <re...@trialox.org>.
On Fri, May 27, 2011 at 1:00 PM, Henry Story <he...@bblfish.net>wrote:
> Yes, perhaps that method of submitting patches is not such a bad idea.
> Though having a remote
> repository on github would make testing of new ideas easier perhaps, as
> people could just mount the
> remote branch. I suppose that for the size of the Clerezza project one
> would start needing a paying
> access to github...
>
It the branch contains the whole of parent, it's as easy to checkout out and
compile the branch hat it is to do this for trunk, after all in svn they are
just different folders.
btw: the command needed to revert CLEREZZA-515 in trunk is:
svn merge -r 1125855:1125850
https://svn.apache.org/repos/asf/incubator/clerezza/trunk/parent/
svn commit -m "CLEREZZA-515: reverting changes as requested on list"
Cheers,
Reto
Re: branching in git-svn
Posted by Henry Story <he...@bblfish.net>.
To create a new branch one has to use svn. That is easy, because if SVN has one thing that it is
better at than git, it is its web integration.
svn copy https://svn.apache.org/repos/asf/incubator/clerezza/trunk/parent https://svn.apache.org/repos/asf/incubator/clerezza/branches/bblfish -m "a branch of fishy things"
This then explains how to work with git and remote branches.
http://www.jukie.net/bart/blog/svn-branches-in-git
I had already checked out my directory using --stdlayout
So now after having created the new remote branch I ran
$ git svn rebase
But that does not update the other branches. So I ran
$ git svn fetch
Well it's been running for at least half an hour now if not more.... (which is really annoying
because I wanted to go to a scala rdf talk in Paris, and need to catch the train soon)
My feeling is that this is not going to work very well, as keeping different branches
up to date is going to end up generating a lot of mail and end up being confusing on the list.
But I think it is worth trying a little bit.
On 27 May 2011, at 10:26, Bertrand Delacretaz wrote:
> Hi Henry,
>
> On Thu, May 26, 2011 at 4:32 PM, Henry Story <he...@bblfish.net> wrote:
>> I am trying to work out how to do a remote branch using git-svn.
>>
>> It is easy to do them locally, but I am not sure what the correct way of doing them remotely is.
>
> Did you check http://git.apache.org/ and the documentation that that points to?
>
> I'm not using that myself but that should explain how things work.
Yes, perhaps that method of submitting patches is not such a bad idea. Though having a remote
repository on github would make testing of new ideas easier perhaps, as people could just mount the
remote branch. I suppose that for the size of the Clerezza project one would start needing a paying
access to github...
Henry
>
> -Bertrand
Social Web Architect
http://bblfish.net/
Re: branching in git-svn
Posted by Bertrand Delacretaz <bd...@apache.org>.
Hi Henry,
On Thu, May 26, 2011 at 4:32 PM, Henry Story <he...@bblfish.net> wrote:
> I am trying to work out how to do a remote branch using git-svn.
>
> It is easy to do them locally, but I am not sure what the correct way of doing them remotely is.
Did you check http://git.apache.org/ and the documentation that that points to?
I'm not using that myself but that should explain how things work.
-Bertrand