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

Re: merge --dry-run to get diff between two branches

From: Yves Bergeron <yves.bergeron_at_shq.gouv.qc.ca>
Date: 2005-06-28 01:07:43 CEST

Thanks for the quick response.

In my situation, the trunk is not directly related to any of my URLs.
My URLs represents copies of trunk at different moments.

In the book from the nightly build, there is three different syntaxes in
the Synopsis. The second one seems to be new. In the description,
there is no reference to the second syntax. It references the now third
syntax.

I hope it clarifies my comments.

Thanks again.

>>> Ben Collins-Sussman <sussman@collab.net> 06/27/05 5:58 PM >>>

On Jun 27, 2005, at 3:01 PM, Yves Bergeron wrote:

> Hi,
>
> I would like to use this subversion subcommands to get a summary of
> the differences between two branches with subversion 1.2:
>
> cd wc/trunk
> svn merge --dry-run http://shq-xsrc01:8080/demosvn/tags/prod \
> http://shq-xsrc01:8080/demosvn/branches/
> correctifs-prod

'svn merge' does not give difference summaries, really It applies
changes to a working copy. But I guess you know that already.

(It just so happens, however, that some devs *are* working on a new
option to 'svn diff URL1 URL2' to print status codes, rather than
unified diffs. I can't wait for that.)

>
> I get this message:
>
> svn: A working copy merge source needs an explicit revision
>

Is 'trunk' related to the two URLs? Do you get any output -before-
that error?

> Also, the latest documentation about this subcommand is not very
> helpful. It doesn't seems to be up to date with the usage.

Um, can you be more specific? :-)

« Le présent courriel peut contenir des renseignements confidentiels et ne s'adresse qu'au destinataire dont le nom apparaît ci-dessus. Si ce courriel vous est parvenu par mégarde, veuillez le supprimer et nous en aviser aussitôt. Merci. »

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Jun 28 01:09:51 2005

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