You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by ml...@apache.org on 2011/10/20 12:17:58 UTC
svn commit: r1186711 -
/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/AbstractEventContext.java
Author: mlusetti
Date: Thu Oct 20 10:17:58 2011
New Revision: 1186711
URL: http://svn.apache.org/viewvc?rev=1186711&view=rev
Log:
Merge branch 'TAP5-1505' into trunk
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/AbstractEventContext.java
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/AbstractEventContext.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/AbstractEventContext.java?rev=1186711&r1=1186710&r2=1186711&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/AbstractEventContext.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/AbstractEventContext.java Thu Oct 20 10:17:58 2011
@@ -18,6 +18,8 @@ import org.apache.tapestry5.EventContext
public abstract class AbstractEventContext implements EventContext
{
+ private String[] values;
+
public String[] toStrings()
{
int count = getCount();
@@ -31,4 +33,25 @@ public abstract class AbstractEventConte
return result;
}
+
+ @Override
+ public String toString()
+ {
+ StringBuilder builder = new StringBuilder("EventContext:");
+
+ if (values == null)
+ return builder.append(" null").toString();
+
+ for (int i = 0; i < values.length; i++)
+ {
+ if (i == 0)
+ builder.append(" ");
+ else
+ builder.append(",");
+
+ builder.append(values[i]);
+ }
+
+ return builder.toString();
+ }
}
Re: svn commit: r1186711 - /tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/AbstractEventContext.java
Posted by Howard Lewis Ship <hl...@gmail.com>.
git co trunk
git svn rebase
git co -BmyBranch
... do work & commits ...
git co trunk
git svn rebase
git rebase myBranch
git svn dcommit
On Thu, Oct 20, 2011 at 11:51 PM, Massimo Lusetti <ml...@gmail.com> wrote:
> On Thu, Oct 20, 2011 at 4:48 PM, Howard Lewis Ship <hl...@gmail.com> wrote:
>
>> I create a new local branch for work, but don't dcommit it to
>> apache.org; instead I rebase it onto the trunk and then git svn
>> dcommit.
>
> This is what I've done:
> git branch myBranch
> git checkout myBranch
> git commit -a ...
> git checkout trunk
> git merge myBranch
> git svn rebase
> git svn dcommit
>
> So I should have used git rebase instead of merge? Does it fast
> forward any commit too?
>
> Thanks
> --
> Massimo
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tapestry.apache.org
> For additional commands, e-mail: dev-help@tapestry.apache.org
>
>
--
Howard M. Lewis Ship
Creator of Apache Tapestry
The source for Tapestry training, mentoring and support. Contact me to
learn how I can get you up and productive in Tapestry fast!
(971) 678-5210
http://howardlewisship.com
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tapestry.apache.org
For additional commands, e-mail: dev-help@tapestry.apache.org
Re: svn commit: r1186711 - /tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/AbstractEventContext.java
Posted by Massimo Lusetti <ml...@gmail.com>.
On Thu, Oct 20, 2011 at 4:48 PM, Howard Lewis Ship <hl...@gmail.com> wrote:
> I create a new local branch for work, but don't dcommit it to
> apache.org; instead I rebase it onto the trunk and then git svn
> dcommit.
This is what I've done:
git branch myBranch
git checkout myBranch
git commit -a ...
git checkout trunk
git merge myBranch
git svn rebase
git svn dcommit
So I should have used git rebase instead of merge? Does it fast
forward any commit too?
Thanks
--
Massimo
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tapestry.apache.org
For additional commands, e-mail: dev-help@tapestry.apache.org
Re: svn commit: r1186711 - /tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/AbstractEventContext.java
Posted by Howard Lewis Ship <hl...@gmail.com>.
I create a new local branch for work, but don't dcommit it to
apache.org; instead I rebase it onto the trunk and then git svn
dcommit.
On Thu, Oct 20, 2011 at 4:04 AM, Massimo Lusetti <ml...@gmail.com> wrote:
> On Thu, Oct 20, 2011 at 12:17 PM, <ml...@apache.org> wrote:
>
>> Author: mlusetti
>> Date: Thu Oct 20 10:17:58 2011
>> New Revision: 1186711
>>
>> URL: http://svn.apache.org/viewvc?rev=1186711&view=rev
>> Log:
>> Merge branch 'TAP5-1505' into trunk
>
> I'm using one branch per issue how can assure the original commit log
> is sent back to svn ?
>
> Cheers
>
> --
> Massimo
> http://meridio.blogspot.com
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tapestry.apache.org
> For additional commands, e-mail: dev-help@tapestry.apache.org
>
>
--
Howard M. Lewis Ship
Creator of Apache Tapestry
The source for Tapestry training, mentoring and support. Contact me to
learn how I can get you up and productive in Tapestry fast!
(971) 678-5210
http://howardlewisship.com
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tapestry.apache.org
For additional commands, e-mail: dev-help@tapestry.apache.org
Re: svn commit: r1186711 - /tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/AbstractEventContext.java
Posted by Massimo Lusetti <ml...@gmail.com>.
On Thu, Oct 20, 2011 at 12:17 PM, <ml...@apache.org> wrote:
> Author: mlusetti
> Date: Thu Oct 20 10:17:58 2011
> New Revision: 1186711
>
> URL: http://svn.apache.org/viewvc?rev=1186711&view=rev
> Log:
> Merge branch 'TAP5-1505' into trunk
I'm using one branch per issue how can assure the original commit log
is sent back to svn ?
Cheers
--
Massimo
http://meridio.blogspot.com
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tapestry.apache.org
For additional commands, e-mail: dev-help@tapestry.apache.org