From: Stephen Leake <stephen_leake@stephe-leake.org>
To: emacs-devel <emacs-devel@gnu.org>
Subject: Re: comparing code on different branches
Date: Tue, 04 Jul 2017 12:51:46 -0500 [thread overview]
Message-ID: <86shichyz1.fsf@stephe-leake.org> (raw)
In-Reply-To: <9A9EF0AB-8FD3-44C9-AAE8-ACACDEC69059@gmail.com> (Jean-Christophe Helary's message of "Tue, 4 Jul 2017 09:53:17 +0900")
Jean-Christophe Helary <jean.christophe.helary@gmail.com> writes:
> Sorry, it is more a git question than an emacs question:
>
> I have created a branch where I do my work.
>
> Now, when I test my code modifications, I do eval-buffer etc. But what
> if I also want to test what master does to compare the results?
>
> Do I have to go through a stash/checkout/test/checkout stash apply cycle?
>
> I thought I could actually do my modifications in the scratch buffer
> and keep the original file clean, so that I can always compare, but
> that seems a bit convoluted. Any better idea?
Workspaces are cheap; I keep a full checkout of master, and one of each
branch I'm working on, at all times.
You can use 'git worktree' to minimize fetch and push operations to the
central repository.
--
-- Stephe
prev parent reply other threads:[~2017-07-04 17:51 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-04 0:53 comparing code on different branches Jean-Christophe Helary
2017-07-04 0:57 ` John Wiegley
2017-07-04 1:14 ` Jean-Christophe Helary
2017-07-04 5:17 ` Tino Calancha
2017-07-04 5:53 ` Marcin Borkowski
2017-07-04 9:30 ` Yuri Khan
2017-07-04 23:05 ` Richard Stallman
2017-07-04 23:48 ` Jean-Christophe Helary
2017-07-05 22:59 ` Richard Stallman
2017-07-05 5:54 ` Etienne Prud’homme
2017-07-05 15:55 ` Yann Hodique
2017-07-05 16:07 ` Kaushal Modi
2017-07-05 19:56 ` Etienne Prud'homme
2017-07-06 15:58 ` Richard Stallman
2017-07-13 21:48 ` Etienne Prud’homme
2017-07-04 17:51 ` Stephen Leake [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=86shichyz1.fsf@stephe-leake.org \
--to=stephen_leake@stephe-leake.org \
--cc=emacs-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.