[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: Merging and revision numbers

From: Chris Gummer <chrisgumms_at_hotmail.com>
Date: 2007-02-09 00:36:25 CET

I haven't used it, but I know people who do and they like it.

You may also be interested in:

http://subversion.tigris.org/merge-tracking/

----Original Message Follows----
From: "L. Wayne Johnson" <wayne@zk.com>
To: <users@subversion.tigris.org>
Subject: RE: Merging and revision numbers
Date: Thu, 8 Feb 2007 12:42:16 -0800

>> -----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

_________________________________________________________________
Advertisement: Meet Sexy Singles Today @ Lavalife - Click here
http://a.ninemsn.com.au/b.aspx?URL=http%3A%2F%2Flavalife9%2Eninemsn%2Ecom%2Eau%2Fclickthru%2Fclickthru%2Eact%3Fid%3Dninemsn%26context%3Dan99%26locale%3Den%5FAU%26a%3D23769&_t=754951090&_r=endtext_lavalife_dec_meet&_m=EXT

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Feb 9 00:36:47 2007

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.