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 mhag...@alum.mit.edu http://softwareswirl.blogspot.com/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
