Merging and Ancestry

[Lakshman Srilakshmanan <la...@tradingpost.com.au>]

Hi All,

I have 

/branch/A
/branch/B
/trunk


Scenario 1
----------
I added a new file test.txt into /branch/A. The same file was needed by
project using /branch/B, so they __added__ it again.

Project in Branch A merged their work into trunk.

When Project in Branch B tried to merge their work into trunk we got a
file out of date error on test.txt. Subversion found this as a new file,
deleted the existing file and added the same file again. At commit we
get an error "Out of Date".


Scenario 2
----------
I added a new file test.txt into /branch/A. The same file was needed by
project using /branch/B, so they __merged__ the file from /branch/A.

Project in Branch A merged their work into trunk.

Project in Branch B merged their work into trunk and all was fine.
(Subversion detected a change and realised the file was identical and
did nothing).


I believe in Scenario 2 Subversion realised that test.txt was an
Ancestor and did a file comparison. Could someone please confirm my
observation.

The problem I have is, Scenario 2 being the correct process, how do I
merge a select set of files from /Branch/A into /Branch/B. Using r20:21
is not possible as the test.txt may not be the only change in that
revision. 

Is there an alternate way ? 


Thanks
Lakshman

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Re: Merging and Ancestry

[Ryan Schmidt <su...@ryandesign.com>]

On Aug 17, 2006, at 10:37, Lakshman Srilakshmanan wrote:

> The problem I have is, Scenario 2 being the correct process, how do I
> merge a select set of files from /Branch/A into /Branch/B. Using  
> r20:21
> is not possible as the test.txt may not be the only change in that
> revision.
>
> Is there an alternate way ?

Specify the revision range and the filename.

svn merge -r20:21 $REPO/project/branches/branch2/file.txt file.txt

Or something like that.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org