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

RE: "merging" add files

From: Reedick, Andrew <Andrew.Reedick_at_BellSouth.com>
Date: 2006-09-18 21:28:29 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
> hi
> i have a directory A which was branched at one point to B
> i now want to have certain differences applied to B - in fact i only
> wish added files from A applied to B.
> this would be easy if i could run svn merge on the whole
> directory but
> since i'm only interested in the added files i cannot do this:
> svn merge -r12345:HEAD
> URL/path/to/A working/copy/path/to/B

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
svn status > end.txt
diff start.txt end.txt
svn commit -m "merge -r 123:456 SOURCE_URL"

The diff of start.txt with end.txt is to prove that you will only commit
added files.

fyi: Do not use HEAD when merging. You need to use a specific number
instead. Otherwise your merging tracking will be inaccurate (since HEAD
is a random number.)


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. GA623

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:29:37 2006

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