Hm, can you resend your original bug recipe to the dev@ list? I'd like
the author of libsvn_diff to take a look.
On Feb 3, 2005, at 2:56 AM, Thomas Börkel wrote:
> HI!
>
> "Ben Collins-Sussman" <sussman@collab.net> wrote in message
> news:f03bbf40e1c1d5a5d8f785117d446b9d@collab.net...
>
>> GNU diff and patch is doing only a 2-way diff, but 'svn merge' is
>> doing
>> a 3-way comparison. What does GNU diff3 do with the 3 files?
>
> If I understand the output of diff3 correctly, it finds a conflict on
> that
> merge and that is correct IMHO:
>
> diff3 -E TransportOutUtil-T.java TransportOutUtil-B1.java
> TransportOutUtil-B2.java
>
> 486a
> =======
> lieferMenge = waPosObj.getLiefermenge();
> vkRahmenObj = VkRahmenFactory.search2(manager,
> waPosObj.getVkrahmen(),
>
> ObjectConstants.OPTIMISTIC_LOCK,
> false);
> if (vkRahmenObj != null) {
> vkRahmenObj.setGeliefert(vkRahmenObj.getGeliefert() -
> lieferMenge);
> vkRahmenObj.update();
>
> where = "KARTIKEL = '" + vkRahmenObj.getKartikel()+ "' and " +
> "EDIPARTNER = '" + vkRahmenObj.getEdipartner() + "'
> and " +
> "WERKKUNDE = '" + vkRahmenObj.getWerkkunde() + "' and
> " +
> "ABLADESTELLE = '" + vkRahmenObj.getAbladestelle() +
> "' and
> " +
> "STATUS = 1";
> lieferabrufInObj = LieferabrufInFactory.search2(manager,
> where,
> READ_LOCK,
> true);
> LieferabrufInUtil.unDispatchDeliverySchedule(lieferabrufInObj);
> LieferabrufInUtil.dispatchDeliverySchedule(lieferabrufInObj);
> }
>
>>>>>>>> TransportOutUtil-B2.java
> .
> 445a
> <<<<<<< TransportOutUtil-T.java
>
>
> Thomas
>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Feb 3 15:22:36 2005