[SoC] Rebase feature - Nested revisions

Javier Merino cibervicho at gmail.com
Fri May 30 11:02:27 CDT 2008


2008/5/29 Stefano Tortarolo <stefano.tortarolo at gmail.com>:

> Hi,
>
> the extension is now able to handle nested revisions.
> Rebasing of merge revisions is recognized and avoided.


Good work! But you forgot to update your tests :-)

# HG changeset patch
# User Javier Merino <cibervicho at gmail.com>
# Date 1212163256 -7200
# Node ID 87c2fed34f8a564e6d9562e1a4e21bb271577c4e
# Parent  2f0e151ec30c02f111281476e21eb673139e7ef2
Fixed output ot test-rebase-nested-revisions-3

diff -r 2f0e151ec30c -r 87c2fed34f8a
tests/test-rebase-nested-revisions-3.out
--- a/tests/test-rebase-nested-revisions-3.out  Thu May 29 22:05:18 2008
+0200
+++ b/tests/test-rebase-nested-revisions-3.out  Fri May 30 18:00:56 2008
+0200
@@ -45,6 +45,8 @@
 o  0: C1

 % Rebase
+% - from a merge revision (fails)
+abort: trying to rebase starting from a merge revision
 % - without arguments
 Rebasing [3, 4, 5, 6, 7, 8, 9, 10, 11, 12] on 15, base: 2 head: 12
 Merging completed
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://selenic.com/pipermail/mercurial-devel/attachments/20080530/2a3590c8/attachment.htm 


More information about the Mercurial-devel mailing list