Branch 'uidmap' - scripts/cfs_utils.py scripts/cloudfsd.py scripts/views

Kaleb S. KEITHLEY kkeithle at redhat.com
Fri Jun 10 11:57:53 UTC 2011


On 06/09/2011 04:52 PM, Jeff Darcy wrote:
> The "cloudfsd" branch has been dead for some time now, with all of its
> commits but one merged to master and that one representing an
> experimental feature addition that should have remained there. Git
> doesn't much like having same-content patches with different IDs on
> multiple branches, and when I tried to fix this it screwed up the
> cloudfsd branch beyond recognition. I'm going to *delete* the cloudfsd
> branch, and apply that one patch to a new feature-specific branch that -
> again - nobody else should touch.
> _______________________________________________

Then we (meaning I/me) should rebase the uidmap branch to the master. 
(It's currently a branch off cloudfsd.)


More information about the cloudfs-devel mailing list