git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Michael Haggerty <mhagger@alum.mit.edu>
To: Jason Timrod <jtimrod@yahoo.com>
Cc: "git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: Mapping file contents from one repository to another
Date: Mon, 13 May 2013 10:46:43 +0200	[thread overview]
Message-ID: <5190A873.2040101@alum.mit.edu> (raw)
In-Reply-To: <1368372120.73994.YahooMailNeo@web160305.mail.bf1.yahoo.com>

On 05/12/2013 05:22 PM, Jason Timrod wrote:
> Hi all,
> 
> This is a complicated question to try and ask, let alone answer, so I had best give some background.
> 
> I have two repositories --- one of them, which I'll call "repoA", is the main repository, it's the one which most of the code we develop ends up.  The other repository, "repoB" is our portable version of the code---the one which is used to deploy on systems other than the one which repoA is deployed on.  As such, "repoB" often (and does) contain commits specific to repoB which will never appear in repoA, such as OS-specific things.
> 
> In this case, in repoA we have a man page.  Up until recently, this used to be the same file in both repositories.  But because of the way the files in repoB are deployed, unlike in repoA this file has had its name changed from:
> 
> foo.1 -> foo.1.in
> 
> Because the man page is run through some sed script to replace various things which never need to happen in repoA

Why don't you name it foo.1.in in both repos and pipe it through "cat"
on repoA (i.e., just copy it to foo.1)?  Then you would only have to
maintain a small difference in your build system between repoA/repoB
rather than having to coordinate two versions of the bigger source document.

Michael

-- 
Michael Haggerty
mhagger@alum.mit.edu
http://softwareswirl.blogspot.com/

      reply	other threads:[~2013-05-13  8:46 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-05-12 15:22 Mapping file contents from one repository to another Jason Timrod
2013-05-13  8:46 ` Michael Haggerty [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=5190A873.2040101@alum.mit.edu \
    --to=mhagger@alum.mit.edu \
    --cc=git@vger.kernel.org \
    --cc=jtimrod@yahoo.com \
    /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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).