[prev in list] [next in list] [prev in thread] [next in thread] 

List:       hurd-bug
Subject:    Re: Atomic file locking update
From:       Samuel Thibault <samuel.thibault () gnu ! org>
Date:       2014-11-28 0:00:02
Message-ID: 20141128000002.GP3127 () type ! youpi ! perso ! aquilenet ! fr
[Download RAW message or body]

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

[prev in list] [next in list] [prev in thread] [next in thread]