You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Hendrik Maryns <qw...@sneakemail.com> on 2008/12/04 15:05:10 UTC
Why does a merge Replace my files instead of merging them?
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:
…
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.
--
Hendrik Maryns
http://tcl.sfs.uni-tuebingen.de/~hendrik/
==================
Ask smart questions, get good answers:
http://www.catb.org/~esr/faqs/smart-questions.html
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=979656
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
Re: Why does a merge Replace my files instead of merging them?
Posted by Hendrik Maryns <qw...@sneakemail.com>.
Op 05-12-08 20:05 heeft Paul Koning als volgt van zich laten horen:
>>>>>> "Hendrik" == Hendrik Maryns <qw...@sneakemail.com> writes:
>
> Hendrik> Simon Lucy schreef:
> >> 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.
>
> Hendrik> It wasnât the mime type, but rather svn:executable was set
> Hendrik> for no particular reason. I removed that property, hoping
> Hendrik> that will help in the future.
>
> That should not be the reason -- it's perfectly normal to have
> executable text files. (Scripts)
I agree with ‘should not’, but it seems like it was, since there was
nothing else peculiar about those files. In particular, svn:mime-type
was not set, nor was any other property.
So is this a bug I should report? I will try and see whether it works
correctly now.
Cheers, H.
--
Hendrik Maryns
http://tcl.sfs.uni-tuebingen.de/~hendrik/
==================
www.lieverleven.be
http://catb.org/~esr/faqs/smart-questions.html
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=980722
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
Re: Why does a merge Replace my files instead of merging them?
Posted by Paul Koning <Pa...@dell.com>.
>>>>> "Hendrik" == Hendrik Maryns <qw...@sneakemail.com> writes:
Hendrik> Simon Lucy schreef:
>> 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.
Hendrik> It wasnât the mime type, but rather svn:executable was set
Hendrik> for no particular reason. I removed that property, hoping
Hendrik> that will help in the future.
That should not be the reason -- it's perfectly normal to have
executable text files. (Scripts)
paul
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=980264
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
Re: Why does a merge Replace my files instead of merging them?
Posted by Hendrik Maryns <qw...@sneakemail.com>.
Simon Lucy schreef:
> 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.
It wasn’t the mime type, but rather svn:executable was set for no
particular reason. I removed that property, hoping that will help in
the future.
Thanks, H.
--
Hendrik Maryns
http://tcl.sfs.uni-tuebingen.de/~hendrik/
==================
Ask smart questions, get good answers:
http://www.catb.org/~esr/faqs/smart-questions.html
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=979701
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
Re: Why does a merge Replace my files instead of merging them?
Posted by Simon Lucy <si...@objective2k.com>.
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@subversion.tigris.org].