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

RE: RE: Merging and Additions

From: Gale, David <David.Gale_at_Hypertherm.com>
Date: 2006-05-23 17:28:43 CEST

Michael Pickard wrote:
> Thanks, is there a straightforward way that I can determine "the last
> revision at which [I] performed..." ?
> As I mentioned earlier, this is to be a (bash) scripted process, so I
> would need to determine '42' programmatically, unfortunately, I'm a
> bit
> of a Unix noob.

Currently, no. Or, at least, you can't with svn itself. This is called
"merge tracking", and is one of the most often requested features; the
devs are working on it, but it's a hefty challenge (especially as there
are lots of edge cases). There's a tool called svnmerge which you may
find helpful. Alternatively, have your script store the last merged
revision in a file somewhere, and use that as the basis for your next
merge; this will break if anyone ever does a manual merge, of course.


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue May 23 17:37:59 2006

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.