El Jueves, 24 de Noviembre de 2005 00:10, Gerard Beekmans escribió: > M.Canales.es wrote: > > You made two changes on 6.1.1 changelog that should be merged to trunk. > > Right! Thanks. I forgot I actually made two changes.
First, don't try to do the merge, it will crerate a conflict. The changelog must be edited by hand. > Now it does make more sense. I thought I had to use the trunk's > changelog version too, but I suppose I don't have to. It'll use whatever > is current. Yes. > This does lead me to the next question. > > You said revisions are tied to the entire repository, not a file? Yes. A revision number is like a photo of the full repository at that moment. > I made my first change to changelog.xml which SVN reported to me as > being revision 1000. > > Then I made a change to another file which would become revision 1001. > > Then I made a change to changelog again to fix an issue which becomes > revision 1002. > > Correct? This means that changelog.xml has no revision 1001? Or if it > does, then 1000 and 1001 are identical? In the 1001 "photo" all dir and files are included but with no changes. > How do I find out what the previous revision for changelog.xml was? "svn > info" tells me the last changed. What is the previous last changed? "svn info index.xml", for example show: Path: index.xml Name: index.xml URL: svn+ssh://[EMAIL PROTECTED]/LFS/trunk/BOOK/index.xml Repository UUID: 4aa44e1e-78dd-0310-9ed2-fbcd4c07a689 Revision: 7171 <-- current repository revision number Node Kind: file Schedule: normal Last Changed Author: archaic Last Changed Rev: 6860 <-- the last revision in what this file was changed Last Changed Date: 2005-09-16 05:38:48 +0200 (Fri, 16 Sep 2005) Text Last Updated: 2005-11-10 16:53:40 +0100 (Thu, 10 Nov 2005) Properties Last Updated: 2005-09-17 12:26:01 +0200 (Sat, 17 Sep 2005) Checksum: 93c795c00630969a2b75af74d73a5cbc You only need tho know the "Last Changed Rev" number if you want to apply/create a patch based on the last change in that file. -- Manuel Canales Esparcia Usuario de LFS nº2886: http://www.linuxfromscratch.org LFS en castellano: http://www.escomposlinux.org/lfs-es http://www.lfs-es.com TLDP-ES: http://es.tldp.org -- http://linuxfromscratch.org/mailman/listinfo/lfs-book FAQ: http://www.linuxfromscratch.org/lfs/faq.html Unsubscribe: See the above information page
