Re: [PATCH v2 5/7] add tests for rebasing merged history

2013-05-30 Thread Martin von Zweigbergk
On Wed, May 29, 2013 at 12:57 AM, Johannes Sixt wrote: > Am 5/29/2013 8:39, schrieb Martin von Zweigbergk: >> +# a---b---c >> +# \ \ >> +# d---e \ >> +#\ \ \ >> +# n---o---w---v >> +# \ >> +# z > >> +#TODO: make

Re: [PATCH v2 5/7] add tests for rebasing merged history

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 > +#\ \ > +# e---u > +# > +# uppercase = cherry-picked > +# h = reverted g > +test_expect_failure "rebase -p --onto in merged history does no

Re: [PATCH v2 5/7] add tests for rebasing merged history

2013-05-29 Thread Johannes Sixt
Am 5/29/2013 8:39, schrieb Martin von Zweigbergk: > +# a---b---c > +# \ \ > +# d---e \ > +#\ \ \ > +# n---o---w---v > +# \ > +# z > +#TODO: make all flavors of rebase use --topo-order > +test_run_rebase success '

[PATCH v2 5/7] add tests for rebasing merged history

2013-05-28 Thread Martin von Zweigbergk
--- t/t3400-rebase.sh | 31 + t/t3401-rebase-partial.sh | 45 --- t/t3404-rebase-interactive.sh | 10 +- t/t3409-rebase-preserve-merges.sh | 53 t/t3425-rebase-topology-merges.sh | 250 ++ 5 files changed, 252 ins