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

Re: how to generate the conflict info from a dry run merge?

From: Mark Phippard <markphip_at_gmail.com>
Date: Fri, 22 Aug 2008 12:44:33 -0400

On Fri, Aug 22, 2008 at 12:36 PM, Robert P. J. Day
<rpjday_at_crashcourse.ca> wrote:
> (since i have no shame, i'll ask another question that i'm sure has
> a trivial answer.)
> using svn 1.4 and working from the command line, i tried a dry-run
> merge and saw all A and U, except for a single file that would cause a
> conflict. how can i (still from the command line) display the conflict info
> represented by trying to merge that file? (if that's even a meaningful
> question.)
> obviously, i can "svn cat" and eyeball the files, but i'm guessing there's
> a simpler way to do this, and i still want it to be a "dry run" operation.
> thanks.

You can't. I'd just not use --dry-run in the first place. It
basically does a full merge and just discards the results. So it is
not like it is faster. Just run a merge, look at the results and then

Mark Phippard
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-08-22 18:44:58 CEST

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.