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.

So
        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
smarter.)

*****

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

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Oct 9 19:09:35 2006