M.Canales.es wrote:
"svn merge" works like "svn diff"
To see the changes made by r7170 youn need to compare 7169:7170
Last, two know the last revision at what a file was last changed, run
svn info pat_to/file
You will see two revision numbers: the current repository revision, and the
one for the last change in the file.
I'm still confused.
You said:
to merge r7170 and r7171 to trunk
svn merge -r7169:7171 the_URL
Is this a range or just two versions? If I were to use
svn merge -r 1000:2000
would that only look at version 1000 and 2000, or would it look at
everything in between as well?
I guess I don't understand why I want to merge revision 7170 to trunk. I
only want to merge the contents of 7171 to trunk.
Shouldn't I compare the current trunk version of changelog.xml to the
current branch version of changelog?
If I understand the svn output correctly, changelog.xml was last changed
in revision 7168.
Branch's changelog version was last changed in revision 7171.
So don't I want to run a diff on 7168 and 7171 rather than 7169 and 7171
like you said?
svn merge -r7168:7171 URL
would be what I am looking for?
--
Gerard Beekmans
/* If Linux doesn't have the solution, you have the wrong problem */
--
http://linuxfromscratch.org/mailman/listinfo/lfs-book
FAQ: http://www.linuxfromscratch.org/lfs/faq.html
Unsubscribe: See the above information page
