You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Rob Hubbard <Ro...@celoxica.com> on 2006/10/09 15:02:56 UTC
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.
Thanks,
Rob.
_____________________________________________________________________
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: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
RE: RE: Feature suggestion: --dry-run on update
Posted by "Reedick, Andrew" <An...@BellSouth.com>.
> -----Original Message-----
> From: Murli Varadachari [mailto:murli@yahoo-inc.com]
> Sent: Monday, October 09, 2006 2:20 PM
> To: 'Rob Hubbard'; 'Subversion Mailing List (E-mail)'
> Subject: RE: Feature suggestion: --dry-run on update
>
>
> On a related note is there a way to diff modified files in my
> WS with the
> latest on the branch ? The assumption here is that
>
> (a) since my last update new revisions have been added to the
> same branch by
> a different user.
>
> (b) several files have been modified in my workspace that
> could potentially
> conflict with the newer revisions.
>
> I tried a couple of combinations I.e
>
> svn diff // diffs of modified files against BASE revisions
>
> svn diff BASE:HEAD // diffs of BASE revisions against latest on branch
>
> How do I diff my local changes v/s latest on branch
>
svn diff -r HEAD foo.java
*****
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. GA621
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
RE: Feature suggestion: --dry-run on update
Posted by Murli Varadachari <mu...@yahoo-inc.com>.
On a related note is there a way to diff modified files in my WS with the
latest on the branch ? The assumption here is that
(a) since my last update new revisions have been added to the same branch by
a different user.
(b) several files have been modified in my workspace that could potentially
conflict with the newer revisions.
I tried a couple of combinations I.e
svn diff // diffs of modified files against BASE revisions
svn diff BASE:HEAD // diffs of BASE revisions against latest on branch
How do I diff my local changes v/s latest on branch
Cheers
murli
-----Original Message-----
From: Rob Hubbard [mailto:Rob.Hubbard@celoxica.com]
Sent: Monday, October 09, 2006 8: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.
Thanks,
Rob.
_____________________________________________________________________
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: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
RE: Feature suggestion: --dry-run on update
Posted by "Reedick, Andrew" <An...@BellSouth.com>.
> -----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