{"thread":{"id":"43339","subject":"git UI nit","startedAt":"2006-12-06T14:22:32Z","lastAt":"2006-12-06T16:23:23Z","messageCount":8,"participants":["Han-Wen Nienhuys","Jakub Narebski","Johannes Schindelin"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"294410","messageId":"el6jmt$mej$1@sea.gmane.org","threadId":"43339","inReplyTo":null,"subject":"git UI nit","fromName":"Han-Wen Nienhuys","fromEmail":"hanwen@xs4all.nl","sentAt":"2006-12-06T14:22:32Z","receivedAt":"2006-12-06T14:22:32Z","isPatch":false,"sender":{"key":"hanwen@google.com","avatar":"https://avatars.githubusercontent.com/u/31547?v=4"},"body":"\nWhen merging changes into a dirty working copy, one may get \n\n..\nUpdating 62a005d..7bbd698\nMakefile: needs update\nREADME: needs update\nconfig.mak.in: needs update\nconfigure.ac: needs update\nfatal: Entry 'Makefile' not uptodate. Cannot merge.\n..\n\n\nThis is bad error message; \"uptodate\" suggests that Makefile is too old. \nThe problem is the reverse.  The Makefile has been\nedited and hence it is 'newer'.  \n\nThis message should say \n\n Entry 'Makefile' is dirty. \n Revert or commit changes before merging\n\n-- \n Han-Wen Nienhuys - hanwen@xs4all.nl - http://www.xs4all.nl/~hanwen\n"},{"id":"297435","messageId":"Pine.LNX.4.63.0612061546190.28348@wbgn013.biozentrum.uni-wuerzburg.de","threadId":"43339","inReplyTo":"el6jmt$mej$1@sea.gmane.org","subject":"Re: git UI nit","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2006-12-06T14:46:46Z","receivedAt":"2006-12-06T14:46:46Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Wed, 6 Dec 2006, Han-Wen Nienhuys wrote:\n\n> \n> When merging changes into a dirty working copy, one may get \n> \n> ..\n> Updating 62a005d..7bbd698\n> Makefile: needs update\n> README: needs update\n> config.mak.in: needs update\n> configure.ac: needs update\n> fatal: Entry 'Makefile' not uptodate. Cannot merge.\n> ..\n> \n> \n> This is bad error message; \"uptodate\" suggests that Makefile is too old. \n> The problem is the reverse.  The Makefile has been\n> edited and hence it is 'newer'.  \n\nSomething like this?\n\n-- snip --\n[PATCH] Replace \"needs update\" by \"dirty; needs commit\"\n\nThis should clarify why a merge was not even started.\n\nSigned-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>\n\n---\n\n read-cache.c |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/read-cache.c b/read-cache.c\nindex eae4745..0d22de2 100644\n--- a/read-cache.c\n+++ b/read-cache.c\n@@ -721,7 +721,7 @@ int refresh_cache(unsigned int flags)\n \t\t\t}\n \t\t\tif (quiet)\n \t\t\t\tcontinue;\n-\t\t\tprintf(\"%s: needs update\\n\", ce->name);\n+\t\t\tprintf(\"%s: dirty; needs commit\\n\", ce->name);\n \t\t\thas_errors = 1;\n \t\t\tcontinue;\n"},{"id":"295676","messageId":"4576DD27.6050307@xs4all.nl","threadId":"43339","inReplyTo":"Pine.LNX.4.63.0612061546190.28348@wbgn013.biozentrum.uni-wuerzburg.de","subject":"Re: git UI nit","fromName":"Han-Wen Nienhuys","fromEmail":"hanwen@xs4all.nl","sentAt":"2006-12-06T15:09:27Z","receivedAt":"2006-12-06T15:09:27Z","isPatch":false,"sender":{"key":"hanwen@google.com","avatar":"https://avatars.githubusercontent.com/u/31547?v=4"},"body":"Johannes Schindelin escreveu:\n>  \t\t\t}\n>  \t\t\tif (quiet)\n>  \t\t\t\tcontinue;\n> -\t\t\tprintf(\"%s: needs update\\n\", ce->name);\n> +\t\t\tprintf(\"%s: dirty; needs commit\\n\", ce->name);\n\nYes - I'd just mention revert as an option too. \n \n\n-- \n"},{"id":"296400","messageId":"Pine.LNX.4.63.0612061619120.28348@wbgn013.biozentrum.uni-wuerzburg.de","threadId":"43339","inReplyTo":"4576DD27.6050307@xs4all.nl","subject":"Re: git UI nit","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2006-12-06T15:20:46Z","receivedAt":"2006-12-06T15:20:46Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Wed, 6 Dec 2006, Han-Wen Nienhuys wrote:\n\n> Johannes Schindelin escreveu:\n> >  \t\t\t}\n> >  \t\t\tif (quiet)\n> >  \t\t\t\tcontinue;\n> > -\t\t\tprintf(\"%s: needs update\\n\", ce->name);\n> > +\t\t\tprintf(\"%s: dirty; needs commit\\n\", ce->name);\n> \n> Yes - I'd just mention revert as an option too. \n\nActually, I like it that short.\n\nWe had an email on this list, where the poster said he could not merge \nwith Git. It turned out that the merge failed with conflicts, but he \ndid not bother reading through the messages, apparently because they were \ntoo many.\n\nCiao,\nDscho\n"},{"id":"294914","messageId":"el6nul$58n$2@sea.gmane.org","threadId":"43339","inReplyTo":"Pine.LNX.4.63.0612061619120.28348@wbgn013.biozentrum.uni-wuerzburg.de","subject":"Re: git UI nit","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2006-12-06T15:36:54Z","receivedAt":"2006-12-06T15:36:54Z","isPatch":false,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"Johannes Schindelin wrote:\n\n> On Wed, 6 Dec 2006, Han-Wen Nienhuys wrote:\n> \n>> Johannes Schindelin escreveu:\n>>>                     }\n>>>                     if (quiet)\n>>>                             continue;\n>>> -                   printf(\"%s: needs update\\n\", ce->name);\n>>> +                   printf(\"%s: dirty; needs commit\\n\", ce->name);\n>> \n>> Yes - I'd just mention revert as an option too. \n> \n> Actually, I like it that short.\n\nSo why not simply use \"%s: dirty\\n\"?\n \n> We had an email on this list, where the poster said he could not merge \n> with Git. It turned out that the merge failed with conflicts, but he \n> did not bother reading through the messages, apparently because they were \n> too many.\n\nSome of that stems from the \"pipeline\" model / implementation of git\ncommands, where every separate stage spews it's own warning and error\nmessages.\n-- \nJakub Narebski\nWarsaw, Poland\nShadeHawk on #git\n\n"},{"id":"295238","messageId":"4576E4AB.8010608@xs4all.nl","threadId":"43339","inReplyTo":"Pine.LNX.4.63.0612061619120.28348@wbgn013.biozentrum.uni-wuerzburg.de","subject":"Re: git UI nit","fromName":"Han-Wen Nienhuys","fromEmail":"hanwen@xs4all.nl","sentAt":"2006-12-06T15:41:31Z","receivedAt":"2006-12-06T15:41:31Z","isPatch":false,"sender":{"key":"hanwen@google.com","avatar":"https://avatars.githubusercontent.com/u/31547?v=4"},"body":"Johannes Schindelin escreveu:\n> Actually, I like it that short.\n> \n> We had an email on this list, where the poster said he could not merge \n> with Git. It turned out that the merge failed with conflicts, but he \n> did not bother reading through the messages, apparently because they were \n> too many.\n\ngood point.\n\n\n-- \n"},{"id":"297180","messageId":"4576EA02.2010809@xs4all.nl","threadId":"43339","inReplyTo":"el6nul$58n$2@sea.gmane.org","subject":"Re: git UI nit","fromName":"Han-Wen Nienhuys","fromEmail":"hanwen@xs4all.nl","sentAt":"2006-12-06T16:04:18Z","receivedAt":"2006-12-06T16:04:18Z","isPatch":false,"sender":{"key":"hanwen@google.com","avatar":"https://avatars.githubusercontent.com/u/31547?v=4"},"body":"Jakub Narebski escreveu:\n> Johannes Schindelin wrote:\n> \n>> On Wed, 6 Dec 2006, Han-Wen Nienhuys wrote:\n>>\n>>> Johannes Schindelin escreveu:\n>>>>                     }\n>>>>                     if (quiet)\n>>>>                             continue;\n>>>> -                   printf(\"%s: needs update\\n\", ce->name);\n>>>> +                   printf(\"%s: dirty; needs commit\\n\", ce->name);\n>>> Yes - I'd just mention revert as an option too. \n>> Actually, I like it that short.\n> \n> So why not simply use \"%s: dirty\\n\"?\n\nbecause a newbie doesn't know how to resolve that problem.\n\n-- \n Han-Wen Nienhuys - hanwen@xs4all.nl - http://www.xs4all.nl/~hanwen\n"},{"id":"296183","messageId":"200612061723.23515.jnareb@gmail.com","threadId":"43339","inReplyTo":"4576EA02.2010809@xs4all.nl","subject":"Re: git UI nit","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2006-12-06T16:23:23Z","receivedAt":"2006-12-06T16:23:23Z","isPatch":false,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"Han-Wen Nienhuys wrote:\n> Jakub Narebski escreveu:\n>> Johannes Schindelin wrote:\n>> \n>>> On Wed, 6 Dec 2006, Han-Wen Nienhuys wrote:\n>>>\n>>>> Johannes Schindelin escreveu:\n>>>>>                     }\n>>>>>                     if (quiet)\n>>>>>                             continue;\n>>>>> -                   printf(\"%s: needs update\\n\", ce->name);\n>>>>> +                   printf(\"%s: dirty; needs commit\\n\", ce->name);\n>>>> Yes - I'd just mention revert as an option too. \n>>> Actually, I like it that short.\n>> \n>> So why not simply use \"%s: dirty\\n\"?\n> \n> because a newbie doesn't know how to resolve that problem.\n\nBut there are [at least] two ways to resolve this:\ncommit or revert (reset).\n\n-- \nJakub Narebski\n"}]}