[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: Trying to understand patch management - in combination with version control

Charles Plessy <plessy@debian.org> writes:

> I would be especially interested by any replacement for this. I am
> starting to wonder about the viability of keeping the whole upstream
> sources in a VCS. If a non-redistributable file brought by a new
> upstream release were accidentally commited (in my case, it would
> typically be a PDF version of a scientific article), is there a VCS that
> would allow to permanently delete it? If such file stays in the history,
> would it be a copyright violation? Which VCS allows the repository to be
> corrected after such an accident, even if other commits happened in the
> meantime?

Git allows this.  You break any existing clones of that repository for
pushing changes back, of course, but basically you branch the repository
before the broken commit, make a new commit that fixes it, and then rebase
the remaining subsequent changes on the new fixed commit.  Then move all
the other tags and branches to the new commits, and git gc should remove
the unreachable objects.

Russ Allbery (rra@debian.org)               <http://www.eyrie.org/~eagle/>

Reply to: