>> -----Original Message-----
>> From: Carl Lerche [mailto:clerche@tarot.com]
>> Sent: Wednesday, February 07, 2007 12:21 PM
>> To: users@subversion.tigris.org
>> Subject: Merging and revision numbers
>>
>> Hello all,
>>
>> I had a hopefully simple question. Let's say I have a big project to
>> work on, and I create a branch of trunk. The project will take a few
>> weeks and I want to also keep the branch up to date with trunk. So,
>> every end of day, I merge from trunk into the branch. As far as I
>> understand, the command would be something similar to this:
>>
>> svn merge -r r1:HEAD http://svn.foo.com/project/trunk
>>
>> where r1 is the last time (the day before) that I integrated from trunk.
>>
>> My question is this, is there an easier way to keep track of what r1
>> is than to go through log messages? It seems that it would be
>> somewhat of a pain.
I've not used it personally but take a look at svnmerge:
http://www.orcaware.com/svn/wiki/Svnmerge.py
I believe that the svn developers are using in on this project.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Feb 8 21:43:10 2007