Reason for conflict?

[David Summers <da...@summersoft.fay.ar.us>]

Hi,
   I've been happily using Subversion now for over 3 years.

My server is Win2K Subversion 1.1.4 version and my client is WinXP 
Subversion 1.2.0 version.

About two months ago I created a branch of our trunk code and started 
making some changes on the branch.

For several weeks I did weekly merges of trunk into the branch with no 
problems.

I finished up most of the work on the branch about a month ago and haven't 
made any more changes to it since then.

Today I am working on merging in the changes to the trunk since the last 
merge and I'm getting some conflicts and I don't understand why.  The 
conflicts are not on code or files that I've changed on the branch.

Any ideas?

What am I missing?

Thanks!

--
David Wayne Summers        "Linux: Because reboots are for hardware upgrades!"
david@summersoft.fay.ar.us PGP Key: http://summersoft.fay.ar.us/~david/pgp.txt
PGP Key fingerprint =  0B44 B118 85CC F4EC 7021  1ED4 1516 5B78 E320 2001

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

Re: Reason for conflict?

[David Summers <da...@summersoft.fay.ar.us>]

On Thu, 9 Jun 2005, Ben Collins-Sussman wrote:

> On Jun 9, 2005, at 11:46 AM, David Summers wrote:
>
>> 
>> 
>> Any ideas?
>> 
>
> Not unless you show us specific commands and results.  We need details.
>
> For example, what exact command are you running to merge the branch back to 
> the trunk?
>
>
>

Sorry, no I meant that I'm trying to merge the latest changes from trunk 
from the last time I merged until now into my branch.


Here is what I did (and I've done for the 4 - 5 (?) times previously) when 
I merged from trunk to the branch (using the appropriate revisions each 
time of course):

(Sitting on the branch)

C:\Projects\BattleStorm>svn merge -r 10815:11043 
svn://razorback/BattleStorm/trunk/BattleStorm

Interestingly, of the two files I'm worried about (there were only three 
total conflicts but one is a MS Word .doc file that I'm not worried about 
and I think I may have made a change to it on the branch) one of the two 
files only had

<<<<<<< .working
=======
(changed C++code)
>>>>>>> .r11043

In all 6 places or so so that was easy to "fix" but I still don't 
understand why it occured.

The other .cpp file I'm investigating now and it has one place in it like the 
above but 2 or 3 places that have some changes and also at the end of the 
file it looks like the file has been truncated abnormally.  However 
browsing both the trunk and the branch from the web browser, neither one 
has that "truncation" occuring.  Wierd!

Still investigating the second one to try to figure it out.

Thanks for any insight you may have.

--
David Wayne Summers        "Linux: Because reboots are for hardware upgrades!"
david@summersoft.fay.ar.us PGP Key: http://summersoft.fay.ar.us/~david/pgp.txt
PGP Key fingerprint =  0B44 B118 85CC F4EC 7021  1ED4 1516 5B78 E320 2001

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

Re: Reason for conflict?

[Ben Collins-Sussman <su...@collab.net>]

On Jun 9, 2005, at 11:46 AM, David Summers wrote:

>
>
> Any ideas?
>

Not unless you show us specific commands and results.  We need details.

For example, what exact command are you running to merge the branch  
back to the trunk?



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