Hi Daniel,
[I forgot to address this mail earlier, my apologies]
On Tue, 10 Jul 2018, Daniel Harding wrote:
> On Tue, 10 Jul 2018 at 16:08:57 +0300, Johannes Schindelin wrote:>
> > On Tue, 10 Jul 2018, Daniel Harding wrote:
> >
> > > On Mon, 09 Jul 2018 at 22:14:58 +0300, Johannes Schindelin
Hi Johannes,
On Tue, 10 Jul 2018 at 16:08:57 +0300, Johannes Schindelin wrote:>
On Tue, 10 Jul 2018, Daniel Harding wrote:
On Mon, 09 Jul 2018 at 22:14:58 +0300, Johannes Schindelin wrote:
On Mon, 9 Jul 2018, Daniel Harding wrote:
On Mon, 09 Jul 2018 at 00:02:00 +0300, brian m. carlson
Hi Daniel,
On Tue, 10 Jul 2018, Daniel Harding wrote:
> On Mon, 09 Jul 2018 at 22:14:58 +0300, Johannes Schindelin wrote:
> >
> > On Mon, 9 Jul 2018, Daniel Harding wrote:
> > >
> > > On Mon, 09 Jul 2018 at 00:02:00 +0300, brian m. carlson wrote:
> > > >
> > > > Should this affect the "# Merge
On Mon, 09 Jul 2018 at 22:14:58 +0300, Johannes Schindelin wrote:
On Mon, 9 Jul 2018, Daniel Harding wrote:
On Mon, 09 Jul 2018 at 00:02:00 +0300, brian m. carlson wrote:
>>>
Should this affect the "# Merge the topic branch" line (and the "# C",
"# E", and "# H" lines in the next test) that
On Mon, Jul 09, 2018 at 09:48:55PM +0300, Daniel Harding wrote:
> Hello brian,
>
> On Mon, 09 Jul 2018 at 00:02:00 +0300, brian m. carlson wrote:
> > Should this affect the "# Merge the topic branch" line (and the "# C",
> > "# E", and "# H" lines in the next test) that appears below this? It
>
Daniel Harding writes:
> One question about my original patch - there I had replaced a "grep
> -v" call with a "git stripspace" call in the 'generate correct todo
> list' test. Is relying on "git stripspace" in a test acceptable, or
> should external text manipulation tools like grep, sed etc.
Hi Daniel,
On Mon, 9 Jul 2018, Daniel Harding wrote:
> On Mon, 09 Jul 2018 at 00:02:00 +0300, brian m. carlson wrote:
> > On Sun, Jul 08, 2018 at 09:41:11PM +0300, Daniel Harding wrote:
> > > Signed-off-by: Daniel Harding
> >
> > > diff --git a/t/t3430-rebase-merges.sh
Hi Daniel,
On Mon, 9 Jul 2018, Daniel Harding wrote:
> One question about my original patch - there I had replaced a "grep -v"
> call with a "git stripspace" call in the 'generate correct todo list'
> test. Is relying on "git stripspace" in a test acceptable, or should
> external text
Hello brian,
On Mon, 09 Jul 2018 at 00:02:00 +0300, brian m. carlson wrote:
On Sun, Jul 08, 2018 at 09:41:11PM +0300, Daniel Harding wrote:
Signed-off-by: Daniel Harding
diff --git a/t/t3430-rebase-merges.sh b/t/t3430-rebase-merges.sh
index 78f7c9958..ff474d033 100755
---
Hi Johannes,
On Mon, 09 Jul 2018 at 10:52:13 +0300, Johannes Schindelin wrote:
Hi Brian,
On Sun, 8 Jul 2018, brian m. carlson wrote:
On Sun, Jul 08, 2018 at 09:41:11PM +0300, Daniel Harding wrote:
Signed-off-by: Daniel Harding
I think maybe, as you suggested, a separate test for this
Johannes Schindelin writes:
> Hi Brian,
>
> On Sun, 8 Jul 2018, brian m. carlson wrote:
>
>> On Sun, Jul 08, 2018 at 09:41:11PM +0300, Daniel Harding wrote:
>> > Signed-off-by: Daniel Harding
>>
>> I think maybe, as you suggested, a separate test for this would be
>> beneficial. It might be
Hi Brian,
On Sun, 8 Jul 2018, brian m. carlson wrote:
> On Sun, Jul 08, 2018 at 09:41:11PM +0300, Daniel Harding wrote:
> > Signed-off-by: Daniel Harding
>
> I think maybe, as you suggested, a separate test for this would be
> beneficial. It might be as simple as modifying
On Sun, Jul 08, 2018 at 09:41:11PM +0300, Daniel Harding wrote:
> Signed-off-by: Daniel Harding
I think maybe, as you suggested, a separate test for this would be
beneficial. It might be as simple as modifying 'script-from-scratch' by
doing "sed 's/#/>/'".
> diff --git
Signed-off-by: Daniel Harding
---
t/t3430-rebase-merges.sh | 9 +
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/t/t3430-rebase-merges.sh b/t/t3430-rebase-merges.sh
index 78f7c9958..ff474d033 100755
--- a/t/t3430-rebase-merges.sh
+++ b/t/t3430-rebase-merges.sh
@@ -56,12
14 matches
Mail list logo
