[PATCH] (v2) fix issue 2517 (Manual conflict removal leads to spurious revert report)

[Ed Price <ed...@gmail.com>]

> > The previous code would overwrite the initial value, which isn't
> > necessarily correct either.  Note that the comment on the function
> > says that it sets the flag *if something is reverted*.  It does not say
> > that it sets the flag according to *whether something is reverted*.
> > So now the comment is correct :)
>
> Heh. It would be good if the comment was a bit more specific, though.

Please find attached v2 of the patch which clarifies the comment.

I've also added another testcase which reproduces the bug with property
instead of text conflict.  (Also fixed by the patch.)

Thanks,
-Ed

[[[
Fix for issue #2517 (manual conflict removal leads to spurious
revert report).

 * subversion/libsvn_wc/adm_ops.c
   (revert_admin_things): Set '*reverted' only on real revert.

 * subversion/tests/cmdline/svntest/main.py
   (file_write): New function.

 * subversion/tests/cmdline/revert_tests.py
   (revert_after_manual_conflict_resolution__text): New test.
   (revert_after_manual_conflict_resolution__prop): New test.
   (test_list): Add new tests.
]]]

Re: [PATCH] (v2) fix issue 2517 (Manual conflict removal leads to spurious revert report)

[Garrett Rooney <ro...@electricjellyfish.net>]

On 3/11/06, Ed Price <ed...@gmail.com> wrote:
> On 3/11/06, Branko Čibej <br...@xbc.nu> wrote:
> > Committed in r18842. Thanks!
>
> Great, thank you!  I've added a comment to the issue.  (I don't see
> any way for me to resolve it as fixed; and yes I did try logging in
> first...)

I resolved the issue for you.

-garrett

Re: [PATCH] (v2) fix issue 2517 (Manual conflict removal leads to spurious revert report)

[Ed Price <ed...@gmail.com>]

On 3/11/06, Branko Čibej <br...@xbc.nu> wrote:
> Committed in r18842. Thanks!

Great, thank you!  I've added a comment to the issue.  (I don't see
any way for me to resolve it as fixed; and yes I did try logging in
first...)

-Ed

Re: [PATCH] (v2) fix issue 2517 (Manual conflict removal leads to spurious revert report)

[Branko Čibej <br...@xbc.nu>]

Ed Price wrote:
> [[[
> Fix for issue #2517 (manual conflict removal leads to spurious
> revert report).
>
>  * subversion/libsvn_wc/adm_ops.c
>    (revert_admin_things): Set '*reverted' only on real revert.
>
>  * subversion/tests/cmdline/svntest/main.py
>    (file_write): New function.
>
>  * subversion/tests/cmdline/revert_tests.py
>    (revert_after_manual_conflict_resolution__text): New test.
>    (revert_after_manual_conflict_resolution__prop): New test.
>    (test_list): Add new tests.
> ]]]
>   
Committed in r18842. Thanks!

-- Brane


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