Re: Viewrendered3 Read For Beta Testing

[Matt Wilkie]

>
> Thanks for the encouragement.
>

 You're welcome :)

   I did start a new VR3 branch in my clone. That's what you are supposed 
> to do to work on a new feature.
>

Yes. 
  

> Still, I don't see why just copying the final files over into devel (on my 
> clone) wouldn't have worked.
>

This is the route I've used several times when I can't figure out how to do 
X in git properly. That and deleting the whole local repo (after putting my 
changes somehwere safe) and cloning a totally fresh copy.

FWIW, I've found Git Extensions to be a closer match than GH Desktop to my 
experience with TortoiseHG Workbench:
https://gitextensions.github.io/ (I wish the GitHub founders had discovered 
mecurial before git! Or fossil.)

-matt

-- 
You received this message because you are subscribed to the Google Groups 
"leo-editor" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to leo-editor+unsubscr...@googlegroups.com.
To view this discussion on the web visit 
https://groups.google.com/d/msgid/leo-editor/6695e9f0-ab20-4d42-a985-6d60614fd4ef%40googlegroups.com.

Re: Viewrendered3 Read For Beta Testing

[Thomas Passin]

On Thursday, March 12, 2020 at 6:31:16 PM UTC-4, Matt Wilkie wrote:
>
> Git's branching and merging always confuses me, let alone across forks. 
> Meaning: don't feel bad, you're not alone!
>
> The network graph at https://github.com/tbpassin/leo-editor/network shows 
> your VR3 branch (top black line for me) as starting in the middle of 
> nowhere, not rooted to any Leo branch. Maybe this has something to do with 
> it?
>

Thanks for the encouragement.   I did start a new VR3 branch in my clone. 
That's what you are supposed to do to work on a new feature. I tried to 
merge it with the clone's devel branch, but something weird went on and I 
couldn't see how to do it within Github Desktop. So I just copied the 
changed and new files into (my clone's) devel branch.  I (think that I 
remember) committing that before  making the PR.

I'm more used to working with Mercurial Hg.  It would have opened kdiff3 
and shown the two versions side by side, highlighting the differences, and 
I could just walk through the changes, accepting the ones I wanted for the 
merge.  I'm not sure how to do the equivalent thing in GitHub. Still, I 
don't see why just copying the final files over into devel (on my clone) 
wouldn't have worked.

-- 
You received this message because you are subscribed to the Google Groups 
"leo-editor" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to leo-editor+unsubscr...@googlegroups.com.
To view this discussion on the web visit 
https://groups.google.com/d/msgid/leo-editor/cc567822-3764-4579-866b-acba9353482c%40googlegroups.com.

Re: Viewrendered3 Read For Beta Testing

[Matt Wilkie]

Git's branching and merging always confuses me, let alone across forks. 
Meaning: don't feel bad, you're not alone!

The network graph at https://github.com/tbpassin/leo-editor/network shows 
your VR3 branch (top black line for me) as starting in the middle of 
nowhere, not rooted to any Leo branch. Maybe this has something to do with 
it?

What I don't know is whether I can re-clone the Leo repo since I've already 
> got one. ... Maybe if I start with a new location on my hard drive...
>

You can create as many clones of the same repo as you can make folders on a 
hard drive. ;-)  If GH Desktop makes doing that hard perhaps use the 
command line to create the clone and then try and open it in Desktop?

-matt

-- 
You received this message because you are subscribed to the Google Groups 
"leo-editor" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to leo-editor+unsubscr...@googlegroups.com.
To view this discussion on the web visit 
https://groups.google.com/d/msgid/leo-editor/e3ce5e51-58c3-477a-935c-91f67be305f6%40googlegroups.com.

Re: About the upcoming 6.2 branch

[Matt Wilkie]

Hi Edward,

I understand the logic behind only releasing from certain named branches. I 
don't get why never merge from (any branch) into a release branch. I'm not 
questioning the wisdom I just don't understand what is being acheived.

And, thanks for extending me trust. I'll endeavour to not be clumsy with 
it. :-) 

-matt

-- 
You received this message because you are subscribed to the Google Groups 
"leo-editor" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to leo-editor+unsubscr...@googlegroups.com.
To view this discussion on the web visit 
https://groups.google.com/d/msgid/leo-editor/1bc88f85-41a5-423c-b6d5-49613f928e06%40googlegroups.com.

Improved #1058 replaces leo-editor/branches.md

[Edward K. Ream]

#1058  describes 
Leo's existing branches and their organization.

I have just upgraded this issue, adding the excellent picture in 
branches.md.

As a result, I have deleted branches.md. It will always contain out-of-date 
data.

Edward

-- 
You received this message because you are subscribed to the Google Groups 
"leo-editor" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to leo-editor+unsubscr...@googlegroups.com.
To view this discussion on the web visit 
https://groups.google.com/d/msgid/leo-editor/ffe89494-1e7e-46f5-aa0d-f1214a264d7d%40googlegroups.com.

Re: Viewrendered3 Read For Beta Testing

[Thomas Passin]

All right, I'll see if I can do that.  The thing is, I was already working 
with a clone of the Leo repo.  Github Desktop clones the repo, sets the 
clone up on your own Github account, and sets it to point to the Leo repo 
as the upstream - all those actions you would otherwise do one by one, if 
you remembered all the git commands, get done in one fell swoop.  What I 
don't know is whether I can re-clone the Leo repo since I've already got 
one.

Maybe if I start with a new location on my hard drive...

On Thursday, March 12, 2020 at 5:13:51 AM UTC-4, Edward K. Ream wrote:
>
>
>
> On Wed, Mar 11, 2020 at 12:04 PM Thomas Passin  > wrote:
>
>>
>> Can I just clone a branch of the Leo repo?  I thought - at least, using 
>> Github Desktop - that I could only get the whole repo with all its branches.
>>
>
> I never use Github desktop, so I couldn't say.
>
> Yes, I recommend cloning the Leo repo, and switching to the devel branch. 
> Then add vr3.py and any other needed files. Carefully check the diffs, then 
> file a PR.
>
> Edward
>

-- 
You received this message because you are subscribed to the Google Groups 
"leo-editor" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to leo-editor+unsubscr...@googlegroups.com.
To view this discussion on the web visit 
https://groups.google.com/d/msgid/leo-editor/de2f730f-39e2-4c87-87a8-551da8f6f077%40googlegroups.com.

Re: Please test the dock2 branch

[Edward K. Ream]

On Thu, Mar 12, 2020 at 7:11 AM Edward K. Ream  wrote:

> Today's work attempts a fix for the "new" bug reported in #1527
> . See the issue for
> a description of the bug.
>
> The new code passes my hand tests, but this is difficult code to test. It
> depends on the history of the cache.
>
> Please report your experiences.
>
> I'll merge the dock2 branch into both the devel and 6.2 branches assuming
> all goes well.
>

Well, it turned out I did today's work in the 6.2 branch. I have just
merged 6.2 into dock2 and devel. Please report any problems in devel, or
dock2 or wherever ;-)

Edward

-- 
You received this message because you are subscribed to the Google Groups 
"leo-editor" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to leo-editor+unsubscr...@googlegroups.com.
To view this discussion on the web visit 
https://groups.google.com/d/msgid/leo-editor/CAMF8tS17hHRTR0PZakTG89ojGBoD20fzEas5jSv4YEzNdzN1Ag%40mail.gmail.com.

Please test the dock2 branch

[Edward K. Ream]

Today's work attempts a fix for the "new" bug reported in #1527 
. See the issue for a 
description of the bug.

The new code passes my hand tests, but this is difficult code to test. It 
depends on the history of the cache.

Please report your experiences.

I'll merge the dock2 branch into both the devel and 6.2 branches assuming 
all goes well.

Edward

-- 
You received this message because you are subscribed to the Google Groups 
"leo-editor" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to leo-editor+unsubscr...@googlegroups.com.
To view this discussion on the web visit 
https://groups.google.com/d/msgid/leo-editor/8d47a2e1-1b67-440e-8640-f2b9d280d88b%40googlegroups.com.

Re: Viewrendered3 Read For Beta Testing

[Edward K. Ream]

On Wed, Mar 11, 2020 at 12:04 PM Thomas Passin  wrote:

>
> Can I just clone a branch of the Leo repo?  I thought - at least, using
> Github Desktop - that I could only get the whole repo with all its branches.
>

I never use Github desktop, so I couldn't say.

Yes, I recommend cloning the Leo repo, and switching to the devel branch.
Then add vr3.py and any other needed files. Carefully check the diffs, then
file a PR.

Edward

-- 
You received this message because you are subscribed to the Google Groups 
"leo-editor" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to leo-editor+unsubscr...@googlegroups.com.
To view this discussion on the web visit 
https://groups.google.com/d/msgid/leo-editor/CAMF8tS2B07kPCoGMnpUXRRNMM01M5RfMLY1nNWUBC4O4TQPxeA%40mail.gmail.com.