* Trunk merged into fortran-dev branch
@ 2010-09-27 5:48 Jerry DeLisle
2010-09-27 6:17 ` Basile Starynkevitch
0 siblings, 1 reply; 6+ messages in thread
From: Jerry DeLisle @ 2010-09-27 5:48 UTC (permalink / raw)
To: gfortran; +Cc: gcc patches
Merging r163873 through r164609 from trunk.
Committed revision 164634.
I hand applied the fix to pr45793 while I was at it.
Regards,
Jerry
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: Trunk merged into fortran-dev branch
2010-09-27 5:48 Trunk merged into fortran-dev branch Jerry DeLisle
@ 2010-09-27 6:17 ` Basile Starynkevitch
2010-09-27 9:31 ` Jerry DeLisle
0 siblings, 1 reply; 6+ messages in thread
From: Basile Starynkevitch @ 2010-09-27 6:17 UTC (permalink / raw)
To: Jerry DeLisle; +Cc: gcc patches
On Sun, 26 Sep 2010 08:34:43 -0700
Jerry DeLisle <jvdelisle@frontier.com> wrote:
> Merging r163873 through r164609 from trunk.
What is the best way to merge the trunk into a branch?
I regularily do svnmerge merge to merge trunk into GCC MELT, but
sometimes strange things happens (i.e. I have to svn add new trunk
files manually into GCC MELT). Very often, it is ok, but I don't
understand when and how it goes wrong!
So what tool or script or human procedure did you use to merge trunk
into fortran-dev?
Cheers
--
Basile STARYNKEVITCH http://starynkevitch.net/Basile/
email: basile<at>starynkevitch<dot>net mobile: +33 6 8501 2359
8, rue de la Faiencerie, 92340 Bourg La Reine, France
*** opinions {are only mine, sont seulement les miennes} ***
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: Trunk merged into fortran-dev branch
2010-09-27 6:17 ` Basile Starynkevitch
@ 2010-09-27 9:31 ` Jerry DeLisle
0 siblings, 0 replies; 6+ messages in thread
From: Jerry DeLisle @ 2010-09-27 9:31 UTC (permalink / raw)
To: Basile Starynkevitch; +Cc: gcc patches
On 09/26/2010 09:17 AM, Basile Starynkevitch wrote:
> On Sun, 26 Sep 2010 08:34:43 -0700
> Jerry DeLisle<jvdelisle@frontier.com> wrote:
>
>> Merging r163873 through r164609 from trunk.
>
>
> What is the best way to merge the trunk into a branch?
>
> I regularily do svnmerge merge to merge trunk into GCC MELT, but
> sometimes strange things happens (i.e. I have to svn add new trunk
> files manually into GCC MELT). Very often, it is ok, but I don't
> understand when and how it goes wrong!
>
> So what tool or script or human procedure did you use to merge trunk
> into fortran-dev?
>
> Cheers
>
cd to my local branch
svn update my local branch
svn merge svn+ssh://jvdelisle@gcc.gnu.org/svn/gcc/trunk
bootstrap and test my local branch.
and if all is well.
svn commit
This commits my merged local branch back out to the repository.
I have subversion 1.6.9. New files added locally have to be svn add before the
commit back out, but update adds and deletes files to my locak branch fine.
Regards,
Jerry
^ permalink raw reply [flat|nested] 6+ messages in thread
* Trunk merged into fortran-dev branch
@ 2010-03-21 7:21 Jerry DeLisle
0 siblings, 0 replies; 6+ messages in thread
From: Jerry DeLisle @ 2010-03-21 7:21 UTC (permalink / raw)
To: gfortran; +Cc: gcc patches
Committed revision 157601.
Regards,
Jerry
^ permalink raw reply [flat|nested] 6+ messages in thread
* Trunk merged into fortran-dev branch
@ 2010-02-26 23:39 Jerry DeLisle
0 siblings, 0 replies; 6+ messages in thread
From: Jerry DeLisle @ 2010-02-26 23:39 UTC (permalink / raw)
To: gfortran; +Cc: gcc patches
I have successfully merged trunk into fortran-dev.
Transmitting file data
...
Committed revision 157099.
Regards,
Jerry
^ permalink raw reply [flat|nested] 6+ messages in thread
* Trunk merged into fortran-dev branch
@ 2010-01-09 22:02 Jerry DeLisle
0 siblings, 0 replies; 6+ messages in thread
From: Jerry DeLisle @ 2010-01-09 22:02 UTC (permalink / raw)
To: gfortran; +Cc: gcc patches
I have merged trunk into fortran-dev and included Janus patch for the recent
regressions on the branch. Clean build, clean regression tests.
Committed revision 155778.
Regards,
Jerry
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2010-09-26 18:37 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-09-27 5:48 Trunk merged into fortran-dev branch Jerry DeLisle
2010-09-27 6:17 ` Basile Starynkevitch
2010-09-27 9:31 ` Jerry DeLisle
-- strict thread matches above, loose matches on Subject: below --
2010-03-21 7:21 Jerry DeLisle
2010-02-26 23:39 Jerry DeLisle
2010-01-09 22:02 Jerry DeLisle
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 read-only IMAP folder(s) and NNTP newsgroup(s).