-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi Lakshman,
Sorry for the delay in communicating.
I filed an enhancement request for this at
http://subversion.tigris.org/issues/show_bug.cgi?id=3197
With regards
Kamesh Jayachandran
Srilakshmanan, Lakshman wrote:
> Hi Kamesh,
>
> Thank you very much for the clarification.
> Are there any steps I should take to recommend this as an enhancement,
> or has this already been taken into consideration.
>
> Thanks
> Lakshman
> -----Original Message-----
> From: Kamesh Jayachandran [mailto:kamesh_at_collab.net]
> Sent: Tuesday, 6 May 2008 1:26 AM
> To: Srilakshmanan, Lakshman
> Cc: dev_at_subversion.tigris.org
> Subject: Re: Rollback issue
>
>
>
> Srilakshmanan, Lakshman wrote:
>> Hi Kamesh,
>
>> Sorry for my lack of understanding, but I don't quite understand your
>> expalnation :(
>
>>> Attempting to rollback svn merge -r 3:2 causes a conflict.
>>> Attempting to rollback svn merge -r 5:4 succeeds.
>> I would have thought, both the above scenarios whould have worked.
>> Why should a rollback from head work (-r 5:4) succeed, while a cherry
>> pick (-r 3:2) rollback fail.
>
>> Are you implying that it has to do with the newline ('\n') character
>> and how it is treated. If so please point me to a document or link
>> that explains the issue in detail.
>
>
> It fails as the 'context of the patch' and the merge target are
> different.
>
> Context of patch(reversal of r3)
> ------------------------------
> --- test.c 2008-05-05 20:36:23.981582944 +0530
> +++ test.c 2008-05-05 20:36:32.319315416 +0530
> @@ -1,3 +1,2 @@
> line1
> line2
> -line3
>
> This patch tries to remove 'line3' which follows 'line1' and 'line2'. It
> also means 'line3' should be the last line of the target. In your case
> 'line3' is the third line(not the last line) and hence you get a
> conflict.
>
> Having said that I could see 'gnu diff and patch tool is intelligent
> enough to handle this particular case'.
>
> So it could be an ENHANCEMENT that we can have in our core svn.
>
> With regards
> Kamesh Jayachandran
>
>> Thanks in advance.
>
>> Thanks
>> Lakshman
>> -----Original Message-----
>> From: Kamesh Jayachandran [mailto:kamesh_at_collab.net]
>> Sent: Friday, 2 May 2008 6:01 PM
>> To: Srilakshmanan, Lakshman
>> Cc: dev_at_subversion.tigris.org
>> Subject: Re: Rollback issue
>
>> Hi Lakshman,
>
>> I think the behavior is correct as the context(surrounding new lines
>> line4 and line5 in r5) of r3 has changed and hence it can not be
>> reverse merged without resolving the conflict as per the latest
> conflict.
>> With regards
>> Kamesh Jayachandran
>
>> Srilakshmanan, Lakshman wrote:
>>> Hi All,
>>> I posted this email on the User forum and was directed to post it on
>>> the developer forum as it may be a bug.
>>> Please inform me if this is an inappropriate question at this forum.
>>> I am using svn 1.4.6 on Windows 2003 server SP1.
>>> Scenario 2 works as expected but Scenario 1 fails with a conflict.
>>> Scenario 1
>>> --------------
>>> A new file abc.txt is created.
>>> File name abc.txt
>>> -------------------------
>>> Enter -- First line
>>> Commit (r1)
>>> Enter Second line
>>> Commit (r2)
>>> Enter Third line
>>> Commit (r3)
>>> Enter Fourth line
>>> Commit (r4)
>>> Fifth line
>>> Commit (r5)
>
>>> Attempting to rollback svn merge -r 3:2 causes a conflict.
>>> Attempting to rollback svn merge -r 5:4 succeeds.
>
>>> Scenario 2
>>> --------------
>>> Editing the above file as below
>>> File name abc.txt
>>> -------------------------
>>> First line
>>> Second line
>>> Enter --> This is the sixth line
>>> Commit (r6)
>>> Third line
>>> Fourth line
>>> Fifth line
>>> Seventh line
>>> Commit (r7)
>
>>> Attempting to rollback svn merge -r 6:5 succeeds.
>
>
>>> Thanks
>>> Lakshman
>>> =====================================================================
>>> =
>>> ==========================
>>> EMAIL DISCLAIMER
>>> This email and any attachments are confidential. They may also be
>> subject to copyright.
>>> If you are not an intended recipient of this email please immediately
>
>>> contact us by replying to this email and then delete this email.
>>> You must not read, use, copy, retain, forward or disclose this email
>> or any attachment.
>>> We do not accept any liability arising from or in connection with
>>> unauthorised use or disclosure of the information contained in this
>> email or any attachment.
>>> We make reasonable efforts to protect against computer viruses but we
>
>>> do not accept liability for any liability, loss or damage caused by
>> any computer virus contained in this email.
>>> =====================================================================
>>> =
>>> ==========================
>>> ---------------------------------------------------------------------
>>> To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
>>> For additional commands, e-mail: dev-help_at_subversion.tigris.org
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
> For additional commands, e-mail: dev-help_at_subversion.tigris.org
>
> ========================================================================
> ========================
> EMAIL DISCLAIMER
>
> This email and any attachments are confidential. They may also be
> subject to copyright.
>
> If you are not an intended recipient of this email please immediately
> contact us by replying to this email and then delete this email.
>
> You must not read, use, copy, retain, forward or disclose this email or
> any attachment.
>
> We do not accept any liability arising from or in connection with
> unauthorised use or disclosure of the information contained in this
> email or any attachment.
>
> We make reasonable efforts to protect against computer viruses but we do
> not accept liability for any liability, loss or damage caused by any
> computer virus contained in this email.
> ========================================================================
> ========================
================================================================================================
EMAIL DISCLAIMER
This email and any attachments are confidential. They may also be
subject to copyright.
If you are not an intended recipient of this email please immediately
contact us by replying
to this email and then delete this email.
You must not read, use, copy, retain, forward or disclose this email or
any attachment.
We do not accept any liability arising from or in connection with
unauthorised use or disclosure
of the information contained in this email or any attachment.
We make reasonable efforts to protect against computer viruses but we do
not accept liability
for any liability, loss or damage caused by any computer virus contained
in this email.
================================================================================================
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQFIKaXM3WHvyO0YTCwRAhcbAKCDgkMIyWoidvv3vNQbtSgqF1UGIACgtz7L
FgUtvOzvUFZB74fBNfI89xI=
=JxlG
-----END PGP SIGNATURE-----
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-05-13 16:30:24 CEST