Re: [PATCH v2 2/7] add tests for rebasing with patch-equivalence present

2013-05-30 Thread Martin von Zweigbergk
On Thu, May 30, 2013 at 5:54 AM, Johannes Sixt wrote: > Am 30.05.2013 07:30, schrieb Martin von Zweigbergk: >> On Wed, May 29, 2013 at 12:09 AM, Johannes Sixt wrote: >>> Am 5/29/2013 8:39, schrieb Martin von Zweigbergk: +# f +# / +# a---b---c---g---h +# \

Re: [PATCH v2 2/7] add tests for rebasing with patch-equivalence present

2013-05-30 Thread Johannes Sixt
Am 30.05.2013 07:30, schrieb Martin von Zweigbergk: > On Wed, May 29, 2013 at 12:09 AM, Johannes Sixt wrote: >> Am 5/29/2013 8:39, schrieb Martin von Zweigbergk: >>> +# f >>> +# / >>> +# a---b---c---g---h >>> +# \ >>> +# d---G---i >> ... >>> +test_run_rebase () { >>> + re

Re: [PATCH v2 2/7] add tests for rebasing with patch-equivalence present

2013-05-29 Thread Martin von Zweigbergk
On Wed, May 29, 2013 at 11:40 PM, Felipe Contreras wrote: > On Thu, May 30, 2013 at 1:14 AM, Martin von Zweigbergk > wrote: >> On Wed, May 29, 2013 at 10:41 PM, Felipe Contreras >> wrote: >>> On Thu, May 30, 2013 at 12:30 AM, Martin von Zweigbergk >>> wrote: On Wed, May 29, 2013 at 12:09 A

Re: [PATCH v2 2/7] add tests for rebasing with patch-equivalence present

2013-05-29 Thread Felipe Contreras
On Thu, May 30, 2013 at 1:14 AM, Martin von Zweigbergk wrote: > On Wed, May 29, 2013 at 10:41 PM, Felipe Contreras > wrote: >> On Thu, May 30, 2013 at 12:30 AM, Martin von Zweigbergk >> wrote: >>> On Wed, May 29, 2013 at 12:09 AM, Johannes Sixt >>> wrote: Am 5/29/2013 8:39, schrieb Martin

Re: [PATCH v2 2/7] add tests for rebasing with patch-equivalence present

2013-05-29 Thread Martin von Zweigbergk
On Wed, May 29, 2013 at 10:41 PM, Felipe Contreras wrote: > On Thu, May 30, 2013 at 12:30 AM, Martin von Zweigbergk > wrote: >> On Wed, May 29, 2013 at 12:09 AM, Johannes Sixt wrote: >>> Am 5/29/2013 8:39, schrieb Martin von Zweigbergk: +# f +# / +# a---b---c---g---h >>

Re: [PATCH v2 2/7] add tests for rebasing with patch-equivalence present

2013-05-29 Thread Felipe Contreras
On Thu, May 30, 2013 at 12:30 AM, Martin von Zweigbergk wrote: > On Wed, May 29, 2013 at 12:09 AM, Johannes Sixt wrote: >> Am 5/29/2013 8:39, schrieb Martin von Zweigbergk: >>> +# f >>> +# / >>> +# a---b---c---g---h >>> +# \ >>> +# d---G---i >> ... >>> +test_run_rebase () {

Re: [PATCH v2 2/7] add tests for rebasing with patch-equivalence present

2013-05-29 Thread Martin von Zweigbergk
On Wed, May 29, 2013 at 12:09 AM, Johannes Sixt wrote: > Am 5/29/2013 8:39, schrieb Martin von Zweigbergk: >> +# f >> +# / >> +# a---b---c---g---h >> +# \ >> +# d---G---i > ... >> +test_run_rebase () { >> + result=$1 >> + shift >> + test_expect_$result "rebase $*

Re: [PATCH v2 2/7] add tests for rebasing with patch-equivalence present

2013-05-29 Thread Johannes Sixt
Am 5/29/2013 8:39, schrieb Martin von Zweigbergk: > +# f > +# / > +# a---b---c---g---h > +# \ > +# d---G---i ... > +test_run_rebase () { > + result=$1 > + shift > + test_expect_$result "rebase $* --onto drops patches in onto" " > + reset_rebase && > +

[PATCH v2 2/7] add tests for rebasing with patch-equivalence present

2013-05-28 Thread Martin von Zweigbergk
--- t/lib-rebase.sh | 17 t/t3420-rebase-topology-linear.sh | 85 +++ 2 files changed, 102 insertions(+) diff --git a/t/lib-rebase.sh b/t/lib-rebase.sh index 62b3887..16eeb1c 100644 --- a/t/lib-rebase.sh +++ b/t/lib-rebase.sh @@ -80,3