[Svnmerge] Lost in Properties

[Thomas F. O'Connell]

On Mar 6, 2007, at 10:19 PM, Raman Gupta wrote:

> Thomas F. O'Connell wrote:
>> I've got a fairly standard repository structure, i.e.:
>>
>> trunk/
>> branches/branch-1
>> branches/branch-2
>> ...
>> branches/branch-n
>>
>> I typically develop in parallel in all branches, merge back to the
>> trunk, and then often merge from the trunk into each branch to  
>> keep each
>> branch up to speed with trunk development.
>>
>> In the most recent iteration of this process, I was editing in  
>> branch-1,
>> I used svnmerge.py to merge back to trunk. Then I wanted to merge the
>> changes into branch-2. After I did so, the following file was  
>> created:
>>
>> dir_conflicts.prej
>
> Often, the patch at this URL solves directory property conflicts like
> you're seeing, though without knowing the specific commands you are
> using, and the exact setup of your branches, I don't know for sure if
> it will help:
>
> http://tinyurl.com/3c229c
>
> Please try it out and let us know if it helps you or not. If not, then
> please be more specific about the commands you are using to produce
> the conflict.
>
> Cheers,
> Raman Gupta

I'll check out the patch. In the meantime, I'll go ahead and be more  
specific about the commands since it's easy, and I just ran them.  
Here's what happened:

I had just merged several changes from branches/branch-2 to trunk. I  
typically do all my merges as:

svnmerge.py merge -S $MODIFIED_BRANCH -b

Now I wanted to merge from the trunk to branches/branch-1.

cd branches/branch-1
svnmerge.py merge -S $TRUNK -b

When I tried svn ci at this point, I got the warning about the conflict.

--
Thomas F. O'Connell

optimizing modern web applications
: for search engines, for usability, and for performance :

http://o.ptimized.com/
615-260-0005