all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: David Kastrup <dak@gnu.org>
To: Achim Gratz <Stromeko@nexgo.de>
Cc: emacs-devel@gnu.org
Subject: Re: Multiple checkout copies
Date: Wed, 04 Feb 2015 09:55:30 +0100	[thread overview]
Message-ID: <87mw4u12f1.fsf@fencepost.gnu.org> (raw)
In-Reply-To: <874mr29i4z.fsf@Rainer.invalid> (Achim Gratz's message of "Wed, 04 Feb 2015 09:48:44 +0100")

Achim Gratz <Stromeko@nexgo.de> writes:

> Richard Stallman writes:
>>   > A slightly different version of the above will save disk space by using
>>   > hard links to files in the original repository:
>>   >  git clone emacs emacs-24
>>   >  cd emacs-24
>>   >  git checkout emacs-24
>>
>> Thanks.  Maybe that is what I want to do.
>>
>> My idea is to do my editing in the 'emacs' directory, as well as
>> pulling updates there.  So these points seem like features rather than
>> bugs.
>
> The safest (but a bit more long-winded) way of dealing with simultaneous
> work on multiple branches is IMHO this setup (per example doing work on
> master and emacs-24):
>
> $ git clone git://git.savannah.gnu.org/emacs.git --bare emacs.git
> $ git clone emacs.git/ emacs-master
> $ git clone emacs.git/ emacs-24
> $ cd emacs-24 ; git checkout emacs-24 ; cd ..
>
> This way there's only a single repository to push upstream from (which
> also makes it a bit easier to check what you intend to push).  Making
> this bare ensures you don't do any other work on this repo.

Minus the bare repository (I use my main repository) this is basically
what I do when I find I need to work on a different branch temporarily.
The difference is that I create my cloned directories on-demand and
remove them again once the work has been pushed upstream or integrated
wherever it is supposed to go.

While it isn't as formal a way to work as having one dedicated bare
repository, it is easy to do ad-hoc without prior setup.  Yes,
ping-ponging changes through the main repository is a bit of a nuisance.

-- 
David Kastrup



  reply	other threads:[~2015-02-04  8:55 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-02-01 20:34 Multiple checkout copies Richard Stallman
2015-02-01 21:43 ` Paul Eggert
2015-02-02 13:35   ` Richard Stallman
2015-02-02 15:19     ` Elias Mårtenson
2015-02-03  1:10       ` Richard Stallman
2015-02-03  1:32         ` Paul Eggert
2015-02-03  8:40         ` David Kastrup
2015-02-02 17:42     ` Ivan Shmakov
2015-02-02 18:12       ` Ivan Shmakov
2015-02-03  1:10       ` Richard Stallman
2015-02-03  7:14         ` Ivan Shmakov
2015-02-03 10:02         ` Achim Gratz
2015-02-03 10:22           ` David Kastrup
2015-02-03 12:53             ` Achim Gratz
2015-02-03 13:15               ` David Kastrup
2015-02-03 13:37                 ` Ivan Shmakov
2015-02-03 13:57                   ` David Kastrup
2015-02-03 18:30                     ` Ivan Shmakov
2015-02-03 18:53                       ` David Kastrup
2015-02-03 19:17                         ` Ivan Shmakov
2015-02-03 19:41                           ` David Kastrup
2015-02-03 20:25                             ` Ivan Shmakov
2015-02-04 23:02                             ` Richard Stallman
2015-02-03 17:46         ` Stefan Monnier
2015-02-03 16:50 ` Steinar Bang
2015-02-03 17:05   ` David Kastrup
2015-02-03 22:55     ` Steinar Bang
2015-02-03 23:05   ` Richard Stallman
2015-02-04  8:48     ` Achim Gratz
2015-02-04  8:55       ` David Kastrup [this message]
2015-02-04 12:02       ` Ivan Shmakov

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=87mw4u12f1.fsf@fencepost.gnu.org \
    --to=dak@gnu.org \
    --cc=Stromeko@nexgo.de \
    --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.