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

RE: RE: "merging" add files

From: Reedick, Andrew <Andrew.Reedick_at_BellSouth.com>
Date: 2006-09-18 21:32:11 CEST

> > -----Original Message-----
> > From: allan juul [mailto:allan@muly.dk]
> > Sent: Monday, September 18, 2006 3:17 PM
> > To: Subversion mailing list
> > Subject: "merging" add files
> >
>
> Revert anything that wasn't added:
>
> svn merge -r 123:456 SOURCE_URL TARGET_WORKSPACE
> svn status > start.txt
> echo start.txt | grep -v '^A' merge.log | sed 's/.......//' |
> xargs svn
> revert

Oooops. The 'merge.log' shouldn't be there. Here's the corrected
syntax with a blank line between each command for clarity:

svn merge -r 123:456 SOURCE_URL TARGET_WORKSPACE

svn status > start.txt

echo start.txt | grep -v '^A' | sed 's/.......//' | xargs svn revert

svn status > end.txt #Optional

diff start.txt end.txt #Optional

svn commit -m "merge -r 123:456 SOURCE_URL"

*****

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
Received on Mon Sep 18 21:33:39 2006

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