Thanks for the reply.
Yes; I thought that's what I'd said. I know that "svn st -u" is enough to show which files will require a merge. But I wish to know which of those will have conflicts.
I'm asking for a --dry-run option which would distinguish between a 'G' and a 'C'. I don't want false positives.
[There's less call for this option on update than on merge: an update is almost always necessary, whereas a merge may be optional. However, it would still occasionally be useful, especially when selecting files for a "partial update".]
Actually, I suppose I will sometimes (specifically, when all directories and files are at the same revision) be able to run, for example "svn merge --dry-run -rBASE:HEAD". However, it would be more intuitive and more straightforward, to have a "--dry-run" option on "svn update".
> -----Original Message-----
> From: Reedick, Andrew [mailto:Andrew.Reedick@BellSouth.com]
> Sent: 09 October 2006 18:09
> To: Rob Hubbard; Subversion Mailing List (E-mail)
> Subject: RE: Feature suggestion: --dry-run on update
> > -----Original Message-----
> > From: Rob Hubbard [mailto:Rob.Hubbard@celoxica.com]
> > Sent: Monday, October 09, 2006 11:03 AM
> > To: Subversion Mailing List (E-mail)
> > Subject: Feature suggestion: --dry-run on update
> > Hello,
> > The "merge" subcommand of svn has a "--dry-run" option. The
> > "update" subcommand is related to merge; it would be useful
> > to be able to use --dry-run on an update operation.
> > It is possible, using "svn st -u" to see which files have
> > been both updated in the repository and modified locally (and
> > are thus conflict candidates). However, this command does not
> > show which files will actually conflict. A "dry run" would do so.
> 'svn st -u' already does this, but it's not explicitly listed
> as a 'C'.
> The 'M' means locally modified. The '*' means "a newer
> revision exists
> on the server"
> M * 220 test2/branch/foo.java
> which is a merge conflict.
> svn status -u | grep '^.......[*]' | grep -v '^ [*]'
> should list all the conflicts (and a few false positives. Not all
> status flags would indicate a merge conflict, so the grep
> could be made
> The information transmitted is intended only for the person
> or entity to which it is addressed and may contain
> confidential, proprietary, and/or privileged material. Any
> review, retransmission, dissemination or other use of, or
> taking of any action in reliance upon this information by
> persons or entities other than the intended recipient is
> prohibited. If you received this in error, please contact the
> sender and delete the material from all computers. GA624
This message has been checked for all known viruses by the MessageLabs Virus Scanning Service, on behalf of Celoxica Ltd.
This email and any files transmitted with it are confidential and
may be legally privileged. It is intended solely for the use of the
individual or entity to whom it is addressed. If you have received
this in error, please contact the sender and delete the material
immediately. Whilst this email has been swept for viruses, you
should carry out your own virus check before opening any
attachment. Celoxica Ltd accepts no liability for any loss or
damage which may be caused by software viruses or interception
or interruption of this email.
To unsubscribe, e-mail: email@example.com
For additional commands, e-mail: firstname.lastname@example.org
Received on Tue Oct 10 10:13:51 2006