[SVNMERGE][PATCH] svnmerge rollback

[Madan U Sreenivasan]

On Fri, 19 May 2006 22:20:15 +0530, Daniel Rall <dlr at collab.net> wrote:

> On Fri, 19 May 2006, Madan S. wrote:
> ...
>> Before I fix this and send another version of the patch, do you see
>> anything else that could be improved in the second version of the patch
>> that I just sent? I would like to wait for more comments before giving  
>> one
>> final patch.
>
> It's ready.

Okay. I have implemented all the necessary feedback changes in the patch  
attached herewith. This patch also takes into account the introduction of  
the uninit command and handles the conflict that could arise.
I request the committers to do the honors!

[[[
Implement `svnmerge rollback'.
The `rollback' sub-command can be used to rollback previously integrated
revisions.

Review by: David James <djames at collab.net>
            Daniel Rall <dlr at collab.net>
            Giovanni Bajo <rasky at develer.com>

* 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.
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: smdiff.23.txt
Url: /pipermail/svnmerge/attachments/20060522/293dabcc/attachment.txt 
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: smlog.23.txt
Url: /pipermail/svnmerge/attachments/20060522/293dabcc/attachment-0001.txt