FreeTDS Development Group

["James K. Lowden" <jklowden AT freetds.org>]

On Tue, 2 Oct 2012 11:58:54 -0400
"James K. Lowden" <jklowden AT freetds.org> wrote:

> I attempted to fix the overnight snapshot process, too.  Tomorrow
> we'll see.  

Hmm.  I must not be using git correctly.  Could someone please
recommend a better approach?  From last night's log:

output for Wed Oct  3 04:15:00 EDT 2012

cd /var/releng/freetds/Branch-0_91 && git clean && git pull
Removing freetds-0.92.79.tar.bz2
Removing freetds-0.92.79.tar.bz2.md5
Removing freetds-0.92.79.tar.gz
Removing freetds-0.92.79.tar.gz.md5
Removing make.log
Removing win32/freetds.nsh
Removing win32/version.rc
gitorious.org[0: 2a02:c0:1014::1]: errno=No route to host
Already up-to-date.
cd /var/releng/freetds/Branch-0_91 &&  sed "/^AC_INIT(FreeTDS/ s/,.*\
$/, 0.92.79)/"  configure.ac  | diff -u configure.ac - | patch
...
[success]

but for master, not so good: 

cd /var/releng/freetds/master && git clean && git pull
Removing Makefile
Removing doc/Makefile
Removing freetds-dev.0.92.377.tar.bz2
Removing freetds-dev.0.92.377.tar.bz2.md5
Removing freetds-dev.0.92.377.tar.gz
Removing freetds-dev.0.92.377.tar.gz.md5
Removing include/Makefile
Removing make.log
Removing samples/Makefile
Removing src/Makefile
Not removing src/apps/.deps/
...
Removing src/tds/unittests/Makefile
Removing vms/Makefile
Removing win32/Makefile
Removing win32/msvc6/Makefile
gitorious.org[0: 2a02:c0:1014::1]: errno=No route to host
error: Your local changes to 'configure.ac' would be overwritten by
merge.  Aborting. Please, commit your changes or stash them before you
can merge. Updating 1358a48..f72aa29
*** Error code 1

Stop.
[failure]

What I want is the equivalent of "svn revert", to return all files in
the working directory to their state in the repository.  I don't really
want "git stash" but I guess maybe "git stash clear" might work?  

Alternatively, I could "rm configure.ac" and let "git pull" recover it
for me.  

--jkl