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

[Fwd: Re: Merging and revision numbers]

From: Nick Stolwijk <nick_stolwijk_at_planet.nl>
Date: 2007-02-07 23:20:05 CET

For archiving means; I saw I answered only to the senders mail address.

attached mail follows:


Maybe this is a possibility:

svn merge -r {2007-02-06}:{2007-02-07} http://svn.foo.com/project/trunk

Which will merge all changes from 6 February 00:00 to 7 February 00:00
into your branch.

Look at [1] for other revision/date conventions.

Hth,

Nick Stolwijk

[1]
http://svnbook.red-bean.com/nightly/en/svn.advanced.html#svn.tour.revs.keywords

Carl Lerche wrote:
> 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.
>
> Thanks for any help.
>
> -carl
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Feb 7 23:20:34 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.