Home » Mailing list archives » git » 2006 » December » 6

git UI nit

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Han-Wen Nienhuys <hanwen@...>
To: <git@...>
Subject: git UI nit
Date: Wednesday, December 6, 2006 - 10:22 am

When merging changes into a dirty working copy, one may get 

..
Updating 62a005d..7bbd698
Makefile: needs update
README: needs update
config.mak.in: needs update
configure.ac: needs update
fatal: Entry 'Makefile' not uptodate. Cannot merge.
..


This is bad error message; "uptodate" suggests that Makefile is too old. 
The problem is the reverse.  The Makefile has been
edited and hence it is 'newer'.  

This message should say 

 Entry 'Makefile' is dirty. 
 Revert or commit changes before merging

-- 
 Han-Wen Nienhuys - hanwen@xs4all.nl - http://www.xs4all.nl/~hanwen

-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
git UI nit, Han-Wen Nienhuys, (Wed Dec 6, 10:22 am)
Re: git UI nit, Johannes Schindelin, (Wed Dec 6, 10:46 am)
Re: git UI nit, Han-Wen Nienhuys, (Wed Dec 6, 11:09 am)
Re: git UI nit, Johannes Schindelin, (Wed Dec 6, 11:20 am)
Re: git UI nit, Han-Wen Nienhuys, (Wed Dec 6, 11:41 am)