Re: visualizing hg trees

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

Re: visualizing hg trees

Rik-4
On 03/20/2018 09:00 AM, [hidden email] wrote:
Subject:
Re: Help trying to merge my changes to current default
From:
Carlo De Falco [hidden email]
Date:
03/20/2018 08:49 AM
To:
"John W. Eaton" [hidden email]
CC:
Juan Pablo Carbajal [hidden email], Maintainers GNU Octave [hidden email]
List-Post:
[hidden email]
Content-Transfer-Encoding:
quoted-printable
Precedence:
list
MIME-Version:
1.0
References:
[hidden email] [hidden email] [hidden email] [hidden email]
In-Reply-To:
[hidden email]
Message-ID:
[hidden email]
Content-Type:
text/plain; charset="us-ascii"
Message:
1


        
On 20 Mar 2018, at 16:44, John W. Eaton [hidden email] wrote:

On 03/20/2018 11:19 AM, Juan Pablo Carbajal wrote:
It's hard to say for sure without seeing exactly what you've done.
Ok, attached is my messy committing: a) I mention a local bookmark
(refactor_pkg), b) I mention upstream, c) there are many local merges
(the repo was moving quite fast in octconf)
I think this adds too much noise tot he log, so I was trying to find
out the best way to do it.
Since rebase is an extension (I am not confident), I might go for the
re-cloning. Is there an objection to that?
I use rebase often.  If you are really worried that it will fail, work on a separate clone where it won't matter if you make some mistakes.

Another useful extension is "glog" for displaying a graphical representation of parent commits so you can see more clearly the relationship of changesets, similar to the display here:

http://hg.savannah.gnu.org/hgweb/octave/graph/4f1da669b610
I also sometimes use "hg serve" to be able to see exactly that representation in a browser.

jwe
c.

This is one place where a GUI is incredibly useful.  I use TortoiseHG which is available in the major distributions.  I don't do my actual changes, like rebasing, in the GUI; I still prefer the command line for that.

--Rik