You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by "Brian K. Wallace" <br...@transmorphix.com> on 2006/05/07 04:00:08 UTC
4.1 Merging
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Jesse -
I'm going to start merging the changes up with your 4.1 code. Do you
know where the code was last sync'ed? Did it get completely done after
4.0.2? Or was it before that? (Not wanting to go back any farther than I
have to :-) )
Brian
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.5 (MingW32)
iD8DBQFEXVSoaCoPKRow/gARAnR/AJ0UIbmjSeJUKqI3EN/9xM65IYQ7OgCfdFyz
VG/UCIfJmwJ7eGaqGet03zM=
=A6FF
-----END PGP SIGNATURE-----
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tapestry.apache.org
For additional commands, e-mail: dev-help@tapestry.apache.org
Re: 4.1 Merging
Posted by Fernando Padilla <fe...@alum.mit.edu>.
For future reference put in the comment the svn version number
information of what you're merging from. That way you can always find
it in the svn log.
I might be going into too much detail, but feel free to skip if you want
to. In our office we do stuff like:
svn cp trunk branches/foo
svn ci -m "CREATE: create branch foo from trunk@16789"
- creating new branch
svn merge -r16789:17001 trunk branches/foo
svn ci -m "MERGE: merged -r16789:17001 trunk branches/foo"
- merging all changes after branch was created
- this can be repeated multiple times..
-r17001:18000, -r18000:18567, -r18567:18889, etc
svn merge trunk@17001 branches/foo@17006 trunk
svn ci -m "MERGE: merge trunk@17001 branches/foo@17006 trunk"
- collapse branch back into trunk
- merge any differences between latest branch version and
trunk at last merge point.
- I guess we haven't devised a way to add a log on the branch
when we take merges from the branch back to trunk..
Then we svn log and search for the CREATE/MERGE tags to figure out what
svn version numbers we need to get the merges to work..
Brian K. Wallace wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> I'll start with 4.0.1, then.
>
> As for scary...
> Nooooooooo kidding.
>
> Will keep it building as I commit - suspecting I'll merge / commit
> incrementally.
>
>
> Jesse Kuhnert wrote:
>
>>Hmmm..It definitely wasn't done after 4.0.2. It might have been some time
>>shortly after 4.0.1. That's about as much as I remember. All I know for
>>sure
>>is that it sounds scary :)
>>
>>On 5/6/06, Brian K. Wallace <br...@transmorphix.com> wrote:
>>
>>Jesse -
>>
>> I'm going to start merging the changes up with your 4.1 code. Do you
>>know where the code was last sync'ed? Did it get completely done after
>>4.0.2? Or was it before that? (Not wanting to go back any farther than I
>>have to :-) )
>>
>>Brian
>
>
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.2.5 (MingW32)
>
> iD8DBQFEXXh2aCoPKRow/gARAvmPAJ9laY/N5PpAMaTVqTqzm5ZFbTF0pQCfSuUl
> 7uEMXiIgh9YFVpejisC3S88=
> =PxJi
> -----END PGP SIGNATURE-----
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tapestry.apache.org
> For additional commands, e-mail: dev-help@tapestry.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tapestry.apache.org
For additional commands, e-mail: dev-help@tapestry.apache.org
Re: 4.1 Merging
Posted by "Brian K. Wallace" <br...@transmorphix.com>.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
I'll start with 4.0.1, then.
As for scary...
Nooooooooo kidding.
Will keep it building as I commit - suspecting I'll merge / commit
incrementally.
Jesse Kuhnert wrote:
> Hmmm..It definitely wasn't done after 4.0.2. It might have been some time
> shortly after 4.0.1. That's about as much as I remember. All I know for
> sure
> is that it sounds scary :)
>
> On 5/6/06, Brian K. Wallace <br...@transmorphix.com> wrote:
>>
> Jesse -
>
> I'm going to start merging the changes up with your 4.1 code. Do you
> know where the code was last sync'ed? Did it get completely done after
> 4.0.2? Or was it before that? (Not wanting to go back any farther than I
> have to :-) )
>
> Brian
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.5 (MingW32)
iD8DBQFEXXh2aCoPKRow/gARAvmPAJ9laY/N5PpAMaTVqTqzm5ZFbTF0pQCfSuUl
7uEMXiIgh9YFVpejisC3S88=
=PxJi
-----END PGP SIGNATURE-----
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tapestry.apache.org
For additional commands, e-mail: dev-help@tapestry.apache.org
Re: 4.1 Merging
Posted by Jesse Kuhnert <jk...@gmail.com>.
Hmmm..It definitely wasn't done after 4.0.2. It might have been some time
shortly after 4.0.1. That's about as much as I remember. All I know for sure
is that it sounds scary :)
On 5/6/06, Brian K. Wallace <br...@transmorphix.com> wrote:
>
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Jesse -
>
> I'm going to start merging the changes up with your 4.1 code. Do you
> know where the code was last sync'ed? Did it get completely done after
> 4.0.2? Or was it before that? (Not wanting to go back any farther than I
> have to :-) )
>
> Brian
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.2.5 (MingW32)
>
> iD8DBQFEXVSoaCoPKRow/gARAnR/AJ0UIbmjSeJUKqI3EN/9xM65IYQ7OgCfdFyz
> VG/UCIfJmwJ7eGaqGet03zM=
> =A6FF
> -----END PGP SIGNATURE-----
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tapestry.apache.org
> For additional commands, e-mail: dev-help@tapestry.apache.org
>
>
--
Jesse Kuhnert
Tacos/Tapestry, team member/developer
Open source based consulting work centered around
dojo/tapestry/tacos/hivemind.