[SVNMERGE][PATCH] svnmerge rollback

David James djames at collab.net
Wed May 17 11:38:49 PDT 2006


On 5/16/06, Madan U Sreenivasan <madan at collab.net> wrote:
> Implement `svnmerge rollback'.
> The `rollback' sub-command can be used to rollback previously integrated
> revisions.

Hi Madan,

This patch looks good except for one small problem in the test suite:
  self.launch("touch newfile")

'touch' isn't available on Windows. So we should do this instead:
   open("newfile","w").close()

Other than this issue, the patch looks excellent. I am very impressed
with the extensive suite of new tests.

Since this is a major new feature, I'd like to wait a few days to see
if anyone else has feedback before we commit. Giovanni?

Cheers,

David

>
> Review by: David James <djames at collab.net>
>             Daniel Rall <dlr at collab.net>
>
> * contrib/client-side/svnmerge_test.py
>    (TestCase_TestRepo.testRollbackWithoutInit):
>    (TestCase_TestRepo.testRollbackOutsidePossibleRange):
>    (TestCase_TestRepo.testRollbackWithoutRevisionOpt):
>    (TestCase_TestRepo.testInitAndRollbackRecordOnly):
>    (TestCase_TestRepo.testInitAndRollback):
>    (TestCase_TestRepo.testMergeAndRollbackEmptyRevisionRange):
>    (TestCase_TestRepo.testBlockMergeAndRollback):
>    (TestCase_TestRepo.testMergeAndRollback):
>    (TestCase_TestRepo.testBlockMergeAndRollback): New tests for rollback
>     functionality.
>
> * contrib/client-side/svnmerge.py
>    (warn): New function to print warning message to stdout.
>    (action_rollback): New function. Used to rollback the merges between
>     the given revision numbers.
>    (command_table): New entry for `rollback'.
> ]]]
>
> Regards,
> Madan.
>
> _______________________________________________
> Svnmerge mailing list
> Svnmerge at orcaware.com
> http://www.orcaware.com/mailman/listinfo/svnmerge
>
>
>
>


-- 
David James -- http://www.cs.toronto.edu/~james




More information about the Svnmerge mailing list