More s3compat-for-review patches
abartlet at samba.org
Thu May 27 18:42:29 MDT 2010
On Thu, 2010-05-27 at 11:00 -0400, simo wrote:
> On Thu, 2010-05-27 at 22:47 +1000, Andrew Bartlett wrote:
> > Is there a good way to ensure that we wipe these conflicting files
> > other
> > than the clearly risky rm *? I guess I'll try a 'make clean' in the
> > source3 autoconf build and see if that does the trick.
> You just need to read the text when you do a git commit or even better
> use git status or git add before doing the commit.
> They all will show you if you have deleted a committed file.
Yeah, I didn't mean about how to avoid getting it into git - that was
just a screwup. I was more thinking of a good way to handle swapping
between source3 autoconf and s3compat based waf branches.
Andrew Bartlett http://samba.org/~abartlet/
Authentication Developer, Samba Team http://samba.org
Samba Developer, Cisco Inc.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Size: 190 bytes
Desc: This is a digitally signed message part
More information about the samba-technical