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

Re: Why does a merge Replace my files instead of merging them?

From: Simon Lucy <simon.lucy_at_objective2k.com>
Date: Thu, 04 Dec 2008 15:31:00 +0000

Hendrik Maryns wrote:
> Hi,
>
> As regulars here might have noticed, I’m having a hard time merging. I
> think I got it to work now, but one thing annoys me: Subversion replaces
> some files instead of merging them. Indeed the merge output gives:
>
Are you sure you have mime types for .java files? If subversion thinks
they're binary they'll always get replaced rather than merged.

S

> …
> A
> /home/hendrik/workspace/MonaSearch-visualization/src/de/uni_tuebingen/sfb/lichtenstein/formulas/FirstOrderVariable.java
> A
> /home/hendrik/workspace/MonaSearch-visualization/src/de/uni_tuebingen/sfb/lichtenstein/formulas/FirstOrderExistentialQuantification.java
> A
> /home/hendrik/workspace/MonaSearch-visualization/src/de/uni_tuebingen/sfb/lichtenstein/formulas/Precedence.java
> C
> /home/hendrik/workspace/MonaSearch-visualization/src/de/uni_tuebingen/sfb/lichtenstein/UI/UIBuilder.java
> A
> /home/hendrik/workspace/MonaSearch-visualization/src/de/uni_tuebingen/sfb/lichtenstein/UI/FormulaTransferHandler.java
> R
> /home/hendrik/workspace/MonaSearch-visualization/src/de/uni_tuebingen/sfb/lichtenstein/UI/ResultView.java
> D
> /home/hendrik/workspace/MonaSearch-visualization/src/de/uni_tuebingen/sfb/lichtenstein/UI/StringTransferHandler.java
> U
> /home/hendrik/workspace/MonaSearch-visualization/src/de/uni_tuebingen/sfb/lichtenstein/treebanks/TreebankConverter.java
> R
> /home/hendrik/workspace/MonaSearch-visualization/src/de/uni_tuebingen/sfb/lichtenstein/treebanks/Sentence.java
> G /home/hendrik/workspace/MonaSearch-visualization/src/Mona
> R
> /home/hendrik/workspace/MonaSearch-visualization/.externalToolBuilders
> A
> …
>
> Why is that? E.g. the file ResultView.java should definitely have been
> merged. It is very annoying, since now I have to do ‘Compare with… →
> Latest from repository’ in Eclipse and solve all the differences
> manually, where most could be done by simple merging.
>
> Is there a way to do the merging post-hoc?
>
> TIA, H.
>

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=979669

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2008-12-04 16:32:12 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.