[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Atomic file locking update
From: |
Samuel Thibault |
Subject: |
Re: Atomic file locking update |
Date: |
Fri, 28 Nov 2014 01:00:02 +0100 |
User-agent: |
Mutt/1.5.21+34 (58baf7c9f32f) (2010-12-30) |
Svante Signell, le Thu 27 Nov 2014 19:25:54 +0100, a écrit :
> On Thu, 2014-11-27 at 15:56 +0100, Samuel Thibault wrote:
> > Svante Signell, le Thu 27 Nov 2014 13:49:53 +0100, a écrit :
>
> > As discussed on IRC too, AIUI the record locking patches just get rid
> > of the whole content that I'm patching. So the rebase should be quite
> > trivial: just tell git to keep your version.
>
> I don't use git. I use released versions and debian+quilt+manual patch
> management.
Ok. The principle is still the same: save the resulting file somewhere,
pop everything, update from the repository, push everything, and force
the push of your patch with quilt push -f, put back your file, and use
quilt refresh.
Samuel