This is the mail archive of the gcc@gcc.gnu.org mailing list for the GCC project.

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]
Other format:	[Raw text]

Re: keeping branch up to date with mainline

From: Bernd Schmidt <bernds_cb1 at t-online dot de>
To: Giovanni Bajo <rasky at develer dot com>
Cc: Diego Novillo <dnovillo at redhat dot com>, gcc at gcc dot gnu dot org, mcrosier at ncsu dot edu
Date: Tue, 10 Jan 2006 14:34:50 +0100
Subject: Re: keeping branch up to date with mainline
References: <39565.152.14.22.121.1136308650.squirrel@webmail.ncsu.edu> <200601031224.21979.dnovillo@redhat.com> <43C39CD7.8010809@t-online.de> <037101c615e3$66ae0d40$bf03030a@trilan>

One additional question, suppose I don't want to merge a huge number of revisions in one go, and I do svnmerge.py merge -r a-small-list-of-revisions svn diff ;; to verify everything is OK

Do I then have to commit the merge so far before running svnmerge.py again, or can it get all the information it needs from the local repository?

Bernd

Follow-Ups:
- Re: keeping branch up to date with mainline
  - From: Giovanni Bajo
- Re: keeping branch up to date with mainline
  - From: Giovanni Bajo

References:
- keeping branch up to date with mainline
  - From: mcrosier
- Re: keeping branch up to date with mainline
  - From: Diego Novillo
- Re: keeping branch up to date with mainline
  - From: Bernd Schmidt
- Re: keeping branch up to date with mainline
  - From: Giovanni Bajo

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]